Changeset 184074 in webkit

Timestamp:

May 11, 2015, 3:53:43 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r182810 - Media elements not in a page shouldn't load.
​https://bugs.webkit.org/show_bug.cgi?id=143720

Reviewed by Jer Noble.

No new tests (Theoretical problem noticed in code review).

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::loadResource): Make sure the frame is in a page.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

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

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-14  Brady Eidson  <beidson@apple.com>
+
+        Media elements not in a page shouldn't load.
+        https://bugs.webkit.org/show_bug.cgi?id=143720
+
+        Reviewed by Jer Noble.
+
+        No new tests (Theoretical problem noticed in code review).
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::loadResource): Make sure the frame is in a page.
+
 2015-04-13  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1143 +1143 @@
     }
 
+    if (!frame->page()) {
+        mediaLoadingFailed(MediaPlayer::FormatError);
+        return;
+    }
+
     URL url = initialURL;
     if (!frame->loader().willLoadMediaElementURL(url)) {
@@ -1148 +1153 @@
         return;
     }
-    
+
     // The resource fetch algorithm 
     m_networkState = NETWORK_LOADING;