| OLD | NEW |
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 oldParent->removeChild(&node, exceptionState); | 67 oldParent->removeChild(&node, exceptionState); |
| 68 return; | 68 return; |
| 69 } | 69 } |
| 70 getChildNodes(node, nodes); | 70 getChildNodes(node, nodes); |
| 71 toContainerNode(node).removeChildren(); | 71 toContainerNode(node).removeChildren(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 #if !ENABLE(OILPAN) | 74 #if !ENABLE(OILPAN) |
| 75 void ContainerNode::removeDetachedChildren() | 75 void ContainerNode::removeDetachedChildren() |
| 76 { | 76 { |
| 77 if (connectedSubframeCount()) { | 77 ASSERT(!connectedSubframeCount()); |
| 78 for (Node* child = firstChild(); child; child = child->nextSibling()) | |
| 79 child->updateAncestorConnectedSubframeCountForRemoval(); | |
| 80 } | |
| 81 ASSERT(needsAttach()); | 78 ASSERT(needsAttach()); |
| 82 removeDetachedChildrenInContainer<Node, ContainerNode>(*this); | 79 removeDetachedChildrenInContainer<Node, ContainerNode>(*this); |
| 83 } | 80 } |
| 84 #endif | 81 #endif |
| 85 | 82 |
| 86 void ContainerNode::parserTakeAllChildrenFrom(ContainerNode& oldParent) | 83 void ContainerNode::parserTakeAllChildrenFrom(ContainerNode& oldParent) |
| 87 { | 84 { |
| 88 while (RefPtr<Node> child = oldParent.firstChild()) { | 85 while (RefPtr<Node> child = oldParent.firstChild()) { |
| 89 oldParent.parserRemoveChild(*child); | 86 oldParent.parserRemoveChild(*child); |
| 90 treeScope().adoptIfNeeded(*child); | 87 treeScope().adoptIfNeeded(*child); |
| (...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1216 return true; | 1213 return true; |
| 1217 | 1214 |
| 1218 if (node->isElementNode() && toElement(node)->shadow()) | 1215 if (node->isElementNode() && toElement(node)->shadow()) |
| 1219 return true; | 1216 return true; |
| 1220 | 1217 |
| 1221 return false; | 1218 return false; |
| 1222 } | 1219 } |
| 1223 #endif | 1220 #endif |
| 1224 | 1221 |
| 1225 } // namespace WebCore | 1222 } // namespace WebCore |
| OLD | NEW |