Changeset 194278 in webkit

Timestamp:

Dec 18, 2015 11:37:54 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Fix the !ENABLE(VIDEO) build after r192953 for <picture> element introduction
​https://bugs.webkit.org/show_bug.cgi?id=152431

Since r192953, HTMLSourceElement is built even if video is disabled,
since it is used by the picture element.

But build was broken with -no-video, since HTMLMediaElement usage
should be guarded by VIDEO guards, and its JS bindings were still
under a video conditional.

Patch by Olivier Blin <Olivier Blin> on 2015-12-18
Reviewed by Alex Christensen.

No new tests, build fix only.

• html/HTMLSourceElement.cpp:

(WebCore::HTMLSourceElement::insertedInto):
(WebCore::HTMLSourceElement::removedFrom):

• html/HTMLSourceElement.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLSourceElement.cpp (modified) (2 diffs)
• html/HTMLSourceElement.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-18  Olivier Blin  <olivier.blin@softathome.com>
+
+        Fix the !ENABLE(VIDEO) build after r192953 for <picture> element introduction
+        https://bugs.webkit.org/show_bug.cgi?id=152431
+
+        Since r192953, HTMLSourceElement is built even if video is disabled,
+        since it is used by the picture element.
+
+        But build was broken with -no-video, since HTMLMediaElement usage
+        should be guarded by VIDEO guards, and its JS bindings were still
+        under a video conditional.
+
+        Reviewed by Alex Christensen.
+
+        No new tests, build fix only.
+
+        * html/HTMLSourceElement.cpp:
+        (WebCore::HTMLSourceElement::insertedInto):
+        (WebCore::HTMLSourceElement::removedFrom):
+        * html/HTMLSourceElement.idl:
+
 2015-12-18  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/html/HTMLSourceElement.cpp

@@ -60 +60 @@
     Element* parent = parentElement();
     if (parent) {
+#if ENABLE(VIDEO)
         if (is<HTMLMediaElement>(*parent))
             downcast<HTMLMediaElement>(*parent).sourceWasAdded(this);
-        else if (is<HTMLPictureElement>(*parent))
+        else
+#endif
+        if (is<HTMLPictureElement>(*parent))
             downcast<HTMLPictureElement>(*parent).sourcesChanged();
     }
@@ -74 +77 @@
         parent = &downcast<Element>(removalRoot);
     if (parent) {
+#if ENABLE(VIDEO)
         if (is<HTMLMediaElement>(*parent))
             downcast<HTMLMediaElement>(*parent).sourceWasRemoved(this);
-        else if (is<HTMLPictureElement>(*parent))
+        else
+#endif
+        if (is<HTMLPictureElement>(*parent))
             downcast<HTMLPictureElement>(*parent).sourcesChanged();
     }

trunk/Source/WebCore/html/HTMLSourceElement.idl

@@ -24 +24 @@
  */
 
-[
-    Conditional=VIDEO,
-] interface HTMLSourceElement : HTMLElement {
+interface HTMLSourceElement : HTMLElement {
 [Reflect, URL] attribute DOMString src;
 attribute DOMString type;