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

Side by Side Diff: Source/WebCore/dom/ContainerNodeAlgorithms.h

Issue 10874075: Merge 125988 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 forbidEventDispatch(); 253 forbidEventDispatch();
254 254
255 node->removedFrom(m_insertionPoint); 255 node->removedFrom(m_insertionPoint);
256 notifyDescendantRemovedFromTree(node); 256 notifyDescendantRemovedFromTree(node);
257 257
258 allowEventDispatch(); 258 allowEventDispatch();
259 } 259 }
260 260
261 inline void ChildNodeRemovalNotifier::notify(Node* node) 261 inline void ChildNodeRemovalNotifier::notify(Node* node)
262 { 262 {
263 if (node->inDocument()) 263 if (node->inDocument()) {
264 notifyNodeRemovedFromDocument(node); 264 notifyNodeRemovedFromDocument(node);
265 else if (node->isContainerNode()) 265 node->document()->notifyRemovePendingSheetIfNeeded();
266 } else if (node->isContainerNode())
266 notifyNodeRemovedFromTree(toContainerNode(node)); 267 notifyNodeRemovedFromTree(toContainerNode(node));
267 } 268 }
268 269
269 class ChildFrameDisconnector { 270 class ChildFrameDisconnector {
270 public: 271 public:
271 explicit ChildFrameDisconnector(Node* root); 272 explicit ChildFrameDisconnector(Node* root);
272 void disconnect(); 273 void disconnect();
273 274
274 private: 275 private:
275 void collectDescendant(Node* root); 276 void collectDescendant(Node* root);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 for (unsigned i = 0; i < size; ++i) { 319 for (unsigned i = 0; i < size; ++i) {
319 Target& target = m_list[i]; 320 Target& target = m_list[i];
320 if (target.isValid()) 321 if (target.isValid())
321 target.disconnect(); 322 target.disconnect();
322 } 323 }
323 } 324 }
324 325
325 } // namespace WebCore 326 } // namespace WebCore
326 327
327 #endif // ContainerNodeAlgorithms_h 328 #endif // ContainerNodeAlgorithms_h
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/loading/remove-child-triggers-parser-expected.txt ('k') | Source/WebCore/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698