Changeset 212682 in webkit

Timestamp:

Feb 20, 2017 4:18:31 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Roll out r212621 via r212647. rdar://problem/30563318

Location:

branches/safari-603-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/adoption-agency-unload-iframe-3-expected.txt (deleted)
• LayoutTests/fast/parser/adoption-agency-unload-iframe-3.html (deleted)
• LayoutTests/fast/parser/adoption-agency-unload-iframe-4-expected.txt (deleted)
• LayoutTests/fast/parser/adoption-agency-unload-iframe-4.html (deleted)
• LayoutTests/fast/parser/xml-error-unload-iframe-expected.txt (deleted)
• LayoutTests/fast/parser/xml-error-unload-iframe.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ContainerNode.cpp (modified) (2 diffs)
• Source/WebCore/html/parser/HTMLConstructionSite.cpp (modified) (2 diffs)
• Source/WebCore/xml/XMLErrors.cpp (modified) (1 diff)
• Source/WebCore/xml/parser/XMLDocumentParser.cpp (modified) (2 diffs)

branches/safari-603-branch/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Rollout r212647. rdar://problem/30563318
+
 2017-02-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Rollout r212647. rdar://problem/30563318
+
 2017-02-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/dom/ContainerNode.cpp

@@ -599 +599 @@
 {
     disconnectSubframesIfNeeded(*this, DescendantsOnly);
-    if (oldChild.parentNode() != this)
-        return;
-
-    {
-        NoEventDispatchAssertion assertNoEventDispatch;
-
-        document().nodeChildrenWillBeRemoved(*this);
-
-        ASSERT(oldChild.parentNode() == this);
-        ASSERT(!oldChild.isDocumentFragment());
-
-        Node* prev = oldChild.previousSibling();
-        Node* next = oldChild.nextSibling();
-
-        ChildListMutationScope(*this).willRemoveChild(oldChild);
-        oldChild.notifyMutationObserversNodeWillDetach();
-
-        removeBetween(prev, next, oldChild);
-
-        notifyChildRemoved(oldChild, prev, next, ChildChangeSourceParser);
-        document().notifyRemovePendingSheetIfNeeded();
-    }
+
+    NoEventDispatchAssertion assertNoEventDispatch;
+
+    document().nodeChildrenWillBeRemoved(*this);
+
+    ASSERT(oldChild.parentNode() == this);
+    ASSERT(!oldChild.isDocumentFragment());
+
+    Node* prev = oldChild.previousSibling();
+    Node* next = oldChild.nextSibling();
+
+    ChildListMutationScope(*this).willRemoveChild(oldChild);
+    oldChild.notifyMutationObserversNodeWillDetach();
+
+    removeBetween(prev, next, oldChild);
+
+    notifyChildRemoved(oldChild, prev, next, ChildChangeSourceParser);
+    document().notifyRemovePendingSheetIfNeeded();
 }
 
@@ -724 +720 @@
     ASSERT(!hasTagName(HTMLNames::templateTag));
 
+    if (&document() != &newChild.document())
+        document().adoptNode(newChild);
+
     {
         NoEventDispatchAssertion assertNoEventDispatch;
-
-        if (&document() != &newChild.document())
-            document().adoptNode(newChild);
-
         appendChildCommon(newChild);
         treeScope().adoptIfNeeded(newChild);

branches/safari-603-branch/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -134 +134 @@
         parent->parserRemoveChild(*task.child);
 
-    if (task.child->parentNode())
-        return;
-
     task.parent->parserAppendChild(*task.child);
 }
@@ -143 +140 @@
 {
     ASSERT(task.operation == HTMLConstructionSiteTask::InsertAlreadyParsedChild);
-
-    if (task.child->parentNode())
-        return;
 
     insert(task);

branches/safari-603-branch/Source/WebCore/xml/XMLErrors.cpp

@@ -141 +141 @@
 
         m_document.parserRemoveChild(*documentElement);
-        if (!documentElement->parentNode())
-            body->parserAppendChild(*documentElement);
 
+        body->parserAppendChild(*documentElement);
         m_document.parserAppendChild(rootElement);
 

branches/safari-603-branch/Source/WebCore/xml/parser/XMLDocumentParser.cpp

@@ -196 +196 @@
         return;
 
-    if (m_sawError) {
+    if (m_sawError)
         insertErrorMessageBlock();
-        if (isDetached()) // Inserting an error message may have ran arbitrary scripts.
-            return;
-    } else {
+    else {
         updateLeafTextNode();
         document()->styleScope().didChangeStyleSheetEnvironment();
@@ -217 +215 @@
     // makes sense to call any methods on DocumentParser once it's been stopped.
     // However, FrameLoader::stop calls DocumentParser::finish unconditionally.
-
-    Ref<XMLDocumentParser> protectedThis(*this);
 
     if (m_parserPaused)