Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Side by Side Diff: Source/core/dom/ContainerNode.cpp

Issue 948793003: Fix inconsistent frame detach behavior of ContainerNode::parserRemoveChild. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaseline Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/parser/adoption-agency-crash-03-expected.txt ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 } 592 }
593 593
594 void ContainerNode::parserRemoveChild(Node& oldChild) 594 void ContainerNode::parserRemoveChild(Node& oldChild)
595 { 595 {
596 ASSERT(oldChild.parentNode() == this); 596 ASSERT(oldChild.parentNode() == this);
597 ASSERT(!oldChild.isDocumentFragment()); 597 ASSERT(!oldChild.isDocumentFragment());
598 598
599 Node* prev = oldChild.previousSibling(); 599 Node* prev = oldChild.previousSibling();
600 Node* next = oldChild.nextSibling(); 600 Node* next = oldChild.nextSibling();
601 601
602 oldChild.updateAncestorConnectedSubframeCountForRemoval(); 602 if (oldChild.connectedSubframeCount())
603 ChildFrameDisconnector(oldChild).disconnect();
603 604
604 ChildListMutationScope(*this).willRemoveChild(oldChild); 605 ChildListMutationScope(*this).willRemoveChild(oldChild);
605 oldChild.notifyMutationObserversNodeWillDetach(); 606 oldChild.notifyMutationObserversNodeWillDetach();
606 607
607 removeBetween(prev, next, oldChild); 608 removeBetween(prev, next, oldChild);
608 609
609 notifyNodeRemoved(oldChild); 610 notifyNodeRemoved(oldChild);
610 childrenChanged(ChildrenChange::forRemoval(oldChild, prev, next, ChildrenCha ngeSourceParser)); 611 childrenChanged(ChildrenChange::forRemoval(oldChild, prev, next, ChildrenCha ngeSourceParser));
611 } 612 }
612 613
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 return true; 1465 return true;
1465 1466
1466 if (node->isElementNode() && toElement(node)->shadow()) 1467 if (node->isElementNode() && toElement(node)->shadow())
1467 return true; 1468 return true;
1468 1469
1469 return false; 1470 return false;
1470 } 1471 }
1471 #endif 1472 #endif
1472 1473
1473 } // namespace blink 1474 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/parser/adoption-agency-crash-03-expected.txt ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698