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

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

Issue 26900006: Rename Node::willBeDeletedFrom() to willBeDeletedFromDocument() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Take comments into consideration Created 7 years, 1 month 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 | « no previous file | 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 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 { 89 {
90 while (RefPtr<Node> child = oldParent->firstChild()) { 90 while (RefPtr<Node> child = oldParent->firstChild()) {
91 oldParent->parserRemoveChild(child.get()); 91 oldParent->parserRemoveChild(child.get());
92 treeScope().adoptIfNeeded(child.get()); 92 treeScope().adoptIfNeeded(child.get());
93 parserAppendChild(child.get()); 93 parserAppendChild(child.get());
94 } 94 }
95 } 95 }
96 96
97 ContainerNode::~ContainerNode() 97 ContainerNode::~ContainerNode()
98 { 98 {
99 if (Document* document = documentInternal()) 99 willBeDeletedFromDocument();
100 willBeDeletedFrom(document);
101 removeDetachedChildren(); 100 removeDetachedChildren();
102 } 101 }
103 102
104 static inline bool isChildTypeAllowed(ContainerNode* newParent, Node* child) 103 static inline bool isChildTypeAllowed(ContainerNode* newParent, Node* child)
105 { 104 {
106 if (!child->isDocumentFragment()) 105 if (!child->isDocumentFragment())
107 return newParent->childTypeAllowed(child->nodeType()); 106 return newParent->childTypeAllowed(child->nodeType());
108 107
109 for (Node* node = child->firstChild(); node; node = node->nextSibling()) { 108 for (Node* node = child->firstChild(); node; node = node->nextSibling()) {
110 if (!newParent->childTypeAllowed(node->nodeType())) 109 if (!newParent->childTypeAllowed(node->nodeType()))
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 return true; 988 return true;
990 989
991 if (node->isElementNode() && toElement(node)->shadow()) 990 if (node->isElementNode() && toElement(node)->shadow())
992 return true; 991 return true;
993 992
994 return false; 993 return false;
995 } 994 }
996 #endif 995 #endif
997 996
998 } // namespace WebCore 997 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698