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

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

Issue 12327019: Merge 142500 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 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
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 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 } 787 }
788 788
789 void ContainerNode::attach() 789 void ContainerNode::attach()
790 { 790 {
791 attachChildren(); 791 attachChildren();
792 Node::attach(); 792 Node::attach();
793 } 793 }
794 794
795 void ContainerNode::detach() 795 void ContainerNode::detach()
796 { 796 {
797 Node::detach();
798 detachChildren(); 797 detachChildren();
799 clearChildNeedsStyleRecalc(); 798 clearChildNeedsStyleRecalc();
799 Node::detach();
800 } 800 }
801 801
802 void ContainerNode::childrenChanged(bool changedByParser, Node*, Node*, int chil dCountDelta) 802 void ContainerNode::childrenChanged(bool changedByParser, Node*, Node*, int chil dCountDelta)
803 { 803 {
804 document()->incDOMTreeVersion(); 804 document()->incDOMTreeVersion();
805 if (!changedByParser && childCountDelta) 805 if (!changedByParser && childCountDelta)
806 document()->updateRangesAfterChildrenChanged(this); 806 document()->updateRangesAfterChildrenChanged(this);
807 invalidateNodeListCachesInAncestors(); 807 invalidateNodeListCachesInAncestors();
808 } 808 }
809 809
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 return true; 1121 return true;
1122 1122
1123 if (node->isElementNode() && toElement(node)->shadow()) 1123 if (node->isElementNode() && toElement(node)->shadow())
1124 return true; 1124 return true;
1125 1125
1126 return false; 1126 return false;
1127 } 1127 }
1128 #endif 1128 #endif
1129 1129
1130 } // namespace WebCore 1130 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dynamic/continuation-detach-crash-expected.txt ('k') | Source/WebCore/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698