Changeset 219305 in webkit

Timestamp:

Jul 10, 2017 12:49:29 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

media element handle adding source immediately before src.
​https://bugs.webkit.org/show_bug.cgi?id=174284
rdar://problem/33115439

Patch by Jeremy Jones <​jeremyj@apple.com> on 2017-07-10
Reviewed by David Kilzer.

Source/WebCore:

Test: media/video-source-before-src.html

Adding a source causes a selectMediaResource block to be enqueued.
If dataLoadingPermitted prevents creating the m_player but sets the srcAttr, then
the enqueued selectMediaResource will be in a bad state, with a srcAttr but no m_player.

This fix prevents selectMediaResource from being called, if data loading is not permitted
when adding a source element, to match how it prevents player creation when setting srcAttr.

This fix also adds a debug assert to catch the problem earlier and adds an early return to
prevent the crash in release builds.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::selectMediaResource):
(WebCore::HTMLMediaElement::sourceWasAdded):

LayoutTests:

• media/video-source-before-src.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-source-before-src.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-10  Jeremy Jones  <jeremyj@apple.com>
+
+        media element handle adding source immediately before src.
+        https://bugs.webkit.org/show_bug.cgi?id=174284
+        rdar://problem/33115439
+
+        Reviewed by David Kilzer.
+
+        * media/video-source-before-src.html: Added.
+
 2017-07-10  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-10  Jeremy Jones  <jeremyj@apple.com>
+
+        media element handle adding source immediately before src.
+        https://bugs.webkit.org/show_bug.cgi?id=174284
+        rdar://problem/33115439
+
+        Reviewed by David Kilzer.
+
+        Test: media/video-source-before-src.html
+
+        Adding a source causes a selectMediaResource block to be enqueued.
+        If dataLoadingPermitted prevents creating the m_player but sets the srcAttr, then
+        the enqueued selectMediaResource will be in a bad state, with a srcAttr but no m_player.
+
+        This fix prevents selectMediaResource from being called, if data loading is not permitted
+        when adding a source element, to match how it prevents player creation when setting srcAttr.
+
+        This fix also adds a debug assert to catch the problem earlier and adds an early return to
+        prevent the crash in release builds.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::selectMediaResource):
+        (WebCore::HTMLMediaElement::sourceWasAdded):
+
 2017-07-10  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1324 +1324 @@
             //    Otherwise, if the media element has no assigned media provider object but has a src attribute, then let mode be attribute.
             mode = Attribute;
+            ASSERT(m_player);
+            if (!m_player) {
+                RELEASE_LOG_ERROR(Media, "HTMLMediaElement::selectMediaResource(%p) - has srcAttr but m_player is not created", this);
+                return;
+            }
         } else if (auto firstSource = childrenOfType<HTMLSourceElement>(*this).first()) {
             //    Otherwise, if the media element does not have an assigned media provider object and does not have a src attribute,
@@ -4363 +4368 @@
     // attribute and whose networkState has the value NETWORK_EMPTY, the user agent must invoke 
     // the media element's resource selection algorithm.
-    if (networkState() == HTMLMediaElement::NETWORK_EMPTY) {
+    if (m_networkState == NETWORK_EMPTY) {
         m_nextChildNodeToConsider = &source;
-        selectMediaResource();
+#if PLATFORM(IOS)
+        if (m_mediaSession->dataLoadingPermitted(*this))
+#endif
+            selectMediaResource();
         return;
     }