Title: [182810] trunk/Source/WebCore
- Revision
- 182810
- Author
- beid...@apple.com
- Date
- 2015-04-14 14:24:45 -0700 (Tue, 14 Apr 2015)
Log Message
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: trunk/Source/WebCore/ChangeLog (182809 => 182810)
--- trunk/Source/WebCore/ChangeLog 2015-04-14 21:14:07 UTC (rev 182809)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 21:24:45 UTC (rev 182810)
@@ -1,3 +1,15 @@
+2015-04-14 Brady Eidson <beid...@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-14 Simon Fraser <simon.fra...@apple.com>
[iOS] Clean up registration of layers with the ScrollingCoordinator
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (182809 => 182810)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-14 21:14:07 UTC (rev 182809)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-14 21:24:45 UTC (rev 182810)
@@ -1090,12 +1090,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
