Title: [226514] trunk/Source/WebCore
Revision
226514
Author
[email protected]
Date
2018-01-08 08:46:15 -0800 (Mon, 08 Jan 2018)

Log Message

REGRESSION: [iOS] ASSERTION FAILED: !node.isConnected() in WebCore::notifyNodeInsertedIntoDocument
https://bugs.webkit.org/show_bug.cgi?id=181091

Reviewed by Darin Adler.

Move the work previously performed in insertedIntoAncestor() into didFinishInsertingNode().

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (226513 => 226514)


--- trunk/Source/WebCore/ChangeLog	2018-01-08 16:14:02 UTC (rev 226513)
+++ trunk/Source/WebCore/ChangeLog	2018-01-08 16:46:15 UTC (rev 226514)
@@ -1,3 +1,15 @@
+2018-01-08  Jer Noble  <[email protected]>
+
+        REGRESSION: [iOS] ASSERTION FAILED: !node.isConnected() in WebCore::notifyNodeInsertedIntoDocument
+        https://bugs.webkit.org/show_bug.cgi?id=181091
+
+        Reviewed by Darin Adler.
+
+        Move the work previously performed in insertedIntoAncestor() into didFinishInsertingNode().
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::prepareForLoad):
+
 2018-01-08  Zan Dobersek  <[email protected]>
 
         [Cairo] Use isolated fill and stroke source containers

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (226513 => 226514)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2018-01-08 16:14:02 UTC (rev 226513)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2018-01-08 16:46:15 UTC (rev 226514)
@@ -909,13 +909,17 @@
     INFO_LOG(LOGIDENTIFIER);
 
     HTMLElement::insertedIntoAncestor(insertionType, parentOfInsertedTree);
-    if (insertionType.connectedToDocument) {
+    if (insertionType.connectedToDocument)
         m_inActiveDocument = true;
 
-        if (m_networkState == NETWORK_EMPTY && !attributeWithoutSynchronization(srcAttr).isEmpty())
-            prepareForLoad();
-    }
+    return InsertedIntoAncestorResult::NeedsPostInsertionCallback;
+}
 
+void HTMLMediaElement::didFinishInsertingNode()
+{
+    if (m_inActiveDocument && m_networkState == NETWORK_EMPTY && !attributeWithoutSynchronization(srcAttr).isEmpty())
+        prepareForLoad();
+
     if (!m_explicitlyMuted) {
         m_explicitlyMuted = true;
         m_muted = hasAttributeWithoutSynchronization(mutedAttr);
@@ -922,11 +926,6 @@
         m_mediaSession->canProduceAudioChanged();
     }
 
-    return InsertedIntoAncestorResult::NeedsPostInsertionCallback;
-}
-
-void HTMLMediaElement::didFinishInsertingNode()
-{
     configureMediaControls();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to