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

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

Issue 1309083002: Accurately update Document node counts on disposing shadow roots. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Adjust document node count in addChildNodesToDeletionQueue() Created 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('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 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 ASSERT_WITH_SECURITY_IMPLICATION(!n->m_deletionHasBegun); 506 ASSERT_WITH_SECURITY_IMPLICATION(!n->m_deletionHasBegun);
507 507
508 next = n->nextSibling(); 508 next = n->nextSibling();
509 n->setNextSibling(nullptr); 509 n->setNextSibling(nullptr);
510 n->setParentOrShadowHostNode(nullptr); 510 n->setParentOrShadowHostNode(nullptr);
511 container.setFirstChild(next); 511 container.setFirstChild(next);
512 if (next) 512 if (next)
513 next->setPreviousSibling(nullptr); 513 next->setPreviousSibling(nullptr);
514 514
515 if (!n->refCount()) { 515 if (!n->refCount()) {
516 if (n->inDocument())
517 container.document().decrementNodeCount();
518
516 #if ENABLE(SECURITY_ASSERT) 519 #if ENABLE(SECURITY_ASSERT)
517 n->m_deletionHasBegun = true; 520 n->m_deletionHasBegun = true;
518 #endif 521 #endif
519 // Add the node to the list of nodes to be deleted. 522 // Add the node to the list of nodes to be deleted.
520 // Reuse the nextSibling pointer for this purpose. 523 // Reuse the nextSibling pointer for this purpose.
521 if (tail) 524 if (tail)
522 tail->setNextSibling(n); 525 tail->setNextSibling(n);
523 else 526 else
524 head = n; 527 head = n;
525 528
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1523 return true; 1526 return true;
1524 1527
1525 if (node->isElementNode() && toElement(node)->shadow()) 1528 if (node->isElementNode() && toElement(node)->shadow())
1526 return true; 1529 return true;
1527 1530
1528 return false; 1531 return false;
1529 } 1532 }
1530 #endif 1533 #endif
1531 1534
1532 } // namespace blink 1535 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698