Changeset 184085 in webkit

Timestamp:

May 11, 2015, 6:01:19 AM (11 years ago)

Author:

Carlos Garcia Campos

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 <​beidson@apple.com> on 2015-04-16
Reviewed by Jer Noble.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::configureMediaControls): Bail if the element has no active document.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

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

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

@@ +1 @@
+2015-04-16  Brady Eidson  <beidson@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-04-15  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -5278 +5278 @@
 
 #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();