Log 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184073 => 184074)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 10:41:24 UTC (rev 184073)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 10:53:43 UTC (rev 184074)
@@ -1,3 +1,15 @@
+2015-04-14 Brady Eidson <[email protected]>
+
+ 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 <[email protected]>
Regression: Scrolling on popsci.com spends too much time in FrameView::viewportsContentsChanged()
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp (184073 => 184074)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-11 10:41:24 UTC (rev 184073)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-11 10:53:43 UTC (rev 184074)
@@ -1142,12 +1142,17 @@
return;
}
+ if (!frame->page()) {
+ mediaLoadingFailed(MediaPlayer::FormatError);
+ return;
+ }
+
URL url = ""
if (!frame->loader().willLoadMediaElementURL(url)) {
mediaLoadingFailed(MediaPlayer::FormatError);
return;
}
-
+
// The resource fetch algorithm
m_networkState = NETWORK_LOADING;
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
