Title: [197278] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 197278
- Author
- carlo...@webkit.org
- Date
- 2016-02-28 03:55:54 -0800 (Sun, 28 Feb 2016)
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 <beid...@apple.com> 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.4/Source/WebCore/ChangeLog (197277 => 197278)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 11:48:56 UTC (rev 197277)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 11:55:54 UTC (rev 197278)
@@ -1,3 +1,13 @@
+2015-04-16 Brady Eidson <beid...@apple.com>
+
+ 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-05-01 Martin Robinson <mrobin...@igalia.com>
[GTK] New CORS tests from r183280 fail on WebKitGTK+
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp (197277 => 197278)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-28 11:48:56 UTC (rev 197277)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-28 11:55:54 UTC (rev 197278)
@@ -5183,14 +5183,14 @@
#endif
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
- if (!controls() || !inDocument())
+ if (!controls() || !inDocument() || !inActiveDocument())
return;
ensureUserAgentShadowRoot();
return;
#endif
- if (!controls() || !inDocument()) {
+ if (!controls() || !inDocument() || !inActiveDocument()) {
if (hasMediaControls())
mediaControls()->hide();
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
