Changeset 212682 in webkit
- Timestamp:
- Feb 20, 2017 4:18:31 PM (7 years ago)
- Location:
- branches/safari-603-branch
- Files:
-
- 6 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/safari-603-branch/LayoutTests/ChangeLog
r212676 r212682 1 2017-02-20 Matthew Hanson <matthew_hanson@apple.com> 2 3 Rollout r212647. rdar://problem/30563318 4 1 5 2017-02-20 Matthew Hanson <matthew_hanson@apple.com> 2 6 -
branches/safari-603-branch/Source/WebCore/ChangeLog
r212676 r212682 1 2017-02-20 Matthew Hanson <matthew_hanson@apple.com> 2 3 Rollout r212647. rdar://problem/30563318 4 1 5 2017-02-20 Matthew Hanson <matthew_hanson@apple.com> 2 6 -
branches/safari-603-branch/Source/WebCore/dom/ContainerNode.cpp
r212647 r212682 599 599 { 600 600 disconnectSubframesIfNeeded(*this, DescendantsOnly); 601 if (oldChild.parentNode() != this) 602 return; 603 604 { 605 NoEventDispatchAssertion assertNoEventDispatch; 606 607 document().nodeChildrenWillBeRemoved(*this); 608 609 ASSERT(oldChild.parentNode() == this); 610 ASSERT(!oldChild.isDocumentFragment()); 611 612 Node* prev = oldChild.previousSibling(); 613 Node* next = oldChild.nextSibling(); 614 615 ChildListMutationScope(*this).willRemoveChild(oldChild); 616 oldChild.notifyMutationObserversNodeWillDetach(); 617 618 removeBetween(prev, next, oldChild); 619 620 notifyChildRemoved(oldChild, prev, next, ChildChangeSourceParser); 621 document().notifyRemovePendingSheetIfNeeded(); 622 } 601 602 NoEventDispatchAssertion assertNoEventDispatch; 603 604 document().nodeChildrenWillBeRemoved(*this); 605 606 ASSERT(oldChild.parentNode() == this); 607 ASSERT(!oldChild.isDocumentFragment()); 608 609 Node* prev = oldChild.previousSibling(); 610 Node* next = oldChild.nextSibling(); 611 612 ChildListMutationScope(*this).willRemoveChild(oldChild); 613 oldChild.notifyMutationObserversNodeWillDetach(); 614 615 removeBetween(prev, next, oldChild); 616 617 notifyChildRemoved(oldChild, prev, next, ChildChangeSourceParser); 618 document().notifyRemovePendingSheetIfNeeded(); 623 619 } 624 620 … … 724 720 ASSERT(!hasTagName(HTMLNames::templateTag)); 725 721 722 if (&document() != &newChild.document()) 723 document().adoptNode(newChild); 724 726 725 { 727 726 NoEventDispatchAssertion assertNoEventDispatch; 728 729 if (&document() != &newChild.document())730 document().adoptNode(newChild);731 732 727 appendChildCommon(newChild); 733 728 treeScope().adoptIfNeeded(newChild); -
branches/safari-603-branch/Source/WebCore/html/parser/HTMLConstructionSite.cpp
r212647 r212682 134 134 parent->parserRemoveChild(*task.child); 135 135 136 if (task.child->parentNode())137 return;138 139 136 task.parent->parserAppendChild(*task.child); 140 137 } … … 143 140 { 144 141 ASSERT(task.operation == HTMLConstructionSiteTask::InsertAlreadyParsedChild); 145 146 if (task.child->parentNode())147 return;148 142 149 143 insert(task); -
branches/safari-603-branch/Source/WebCore/xml/XMLErrors.cpp
r212647 r212682 141 141 142 142 m_document.parserRemoveChild(*documentElement); 143 if (!documentElement->parentNode())144 body->parserAppendChild(*documentElement);145 143 144 body->parserAppendChild(*documentElement); 146 145 m_document.parserAppendChild(rootElement); 147 146 -
branches/safari-603-branch/Source/WebCore/xml/parser/XMLDocumentParser.cpp
r212647 r212682 196 196 return; 197 197 198 if (m_sawError) {198 if (m_sawError) 199 199 insertErrorMessageBlock(); 200 if (isDetached()) // Inserting an error message may have ran arbitrary scripts. 201 return; 202 } else { 200 else { 203 201 updateLeafTextNode(); 204 202 document()->styleScope().didChangeStyleSheetEnvironment(); … … 217 215 // makes sense to call any methods on DocumentParser once it's been stopped. 218 216 // However, FrameLoader::stop calls DocumentParser::finish unconditionally. 219 220 Ref<XMLDocumentParser> protectedThis(*this);221 217 222 218 if (m_parserPaused)
Note: See TracChangeset
for help on using the changeset viewer.