Title: [169708] trunk/Source/WebCore
Revision
169708
Author
jer.no...@apple.com
Date
2014-06-09 13:10:18 -0700 (Mon, 09 Jun 2014)

Log Message

ASSERT(!m_inRemovedLastRefFunction) in Element::addShadowRoot while destroying a document
https://bugs.webkit.org/show_bug.cgi?id=133450

Reviewed by Eric Carlson.

ensureUserAgentShadowRoot() is being called when a media element is removed from its document
in HTMLMediaElement::removedFrom() because Node::removedFrom() has not yet run and removed the
InDocument flag from the node.  Rather than calling configureMediaControls() at this point
just expilictly remove the media controls if present.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (169707 => 169708)


--- trunk/Source/WebCore/ChangeLog	2014-06-09 19:30:54 UTC (rev 169707)
+++ trunk/Source/WebCore/ChangeLog	2014-06-09 20:10:18 UTC (rev 169708)
@@ -1,3 +1,18 @@
+2014-06-09  Jer Noble  <jer.no...@apple.com>
+
+        ASSERT(!m_inRemovedLastRefFunction) in Element::addShadowRoot while destroying a document
+        https://bugs.webkit.org/show_bug.cgi?id=133450
+
+        Reviewed by Eric Carlson.
+
+        ensureUserAgentShadowRoot() is being called when a media element is removed from its document
+        in HTMLMediaElement::removedFrom() because Node::removedFrom() has not yet run and removed the
+        InDocument flag from the node.  Rather than calling configureMediaControls() at this point
+        just expilictly remove the media controls if present.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+
 2014-06-09  Mark Hahnenberg  <mhahnenb...@apple.com>
 
         Rebaseline bindings tests after r169703

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (169707 => 169708)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-06-09 19:30:54 UTC (rev 169707)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-06-09 20:10:18 UTC (rev 169708)
@@ -708,7 +708,8 @@
 
     m_inActiveDocument = false;
     if (insertionPoint.inDocument()) {
-        configureMediaControls();
+        if (hasMediaControls())
+            mediaControls()->hide();
         if (m_networkState > NETWORK_EMPTY)
             pause();
         if (m_isFullscreen)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to