Title: [184085] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 184085
- Author
- [email protected]
- Date
- 2015-05-11 06:01:19 -0700 (Mon, 11 May 2015)
Log Message
Merge r182918 - Media element can manipulate DOM during Document destruction.
rdar://problem/20553898 and https://bugs.webkit.org/show_bug.cgi?id=143780
Patch by Brady Eidson <[email protected]> on 2015-04-16
Reviewed by Jer Noble.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::configureMediaControls): Bail if the element has no active document.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184084 => 184085)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 12:59:46 UTC (rev 184084)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 13:01:19 UTC (rev 184085)
@@ -1,3 +1,13 @@
+2015-04-16 Brady Eidson <[email protected]>
+
+ Media element can manipulate DOM during Document destruction.
+ rdar://problem/20553898 and https://bugs.webkit.org/show_bug.cgi?id=143780
+
+ Reviewed by Jer Noble.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::configureMediaControls): Bail if the element has no active document.
+
2015-04-15 Simon Fraser <[email protected]>
We should dump GraphicsLayer's anchorPoint z component
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp (184084 => 184085)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-11 12:59:46 UTC (rev 184084)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-11 13:01:19 UTC (rev 184085)
@@ -5277,12 +5277,12 @@
requireControls = true;
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- if (!requireControls || !inDocument())
+ if (!requireControls || !inDocument() || !inActiveDocument())
return;
ensureUserAgentShadowRoot();
#else
- if (!requireControls || !inDocument()) {
+ if (!requireControls || !inDocument() || !inActiveDocument()) {
if (hasMediaControls())
mediaControls()->hide();
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
