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

Side by Side Diff: third_party/WebKit/Source/core/dom/NodeIterator.cpp

Issue 1854423002: ASSERT -> {DCHECK|DCHECK_XX}, ENABLE(ASSERT) -> DCHECK_IS_ON() in dom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mark svg/as-image/svg-nested.html crash on win Created 4 years, 8 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 * Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no) 3 * Copyright (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
4 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 4 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
5 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 void NodeIterator::nodeWillBeRemoved(Node& removedNode) 144 void NodeIterator::nodeWillBeRemoved(Node& removedNode)
145 { 145 {
146 updateForNodeRemoval(removedNode, m_candidateNode); 146 updateForNodeRemoval(removedNode, m_candidateNode);
147 updateForNodeRemoval(removedNode, m_referenceNode); 147 updateForNodeRemoval(removedNode, m_referenceNode);
148 } 148 }
149 149
150 void NodeIterator::updateForNodeRemoval(Node& removedNode, NodePointer& referenc eNode) const 150 void NodeIterator::updateForNodeRemoval(Node& removedNode, NodePointer& referenc eNode) const
151 { 151 {
152 ASSERT(root()->document() == removedNode.document()); 152 DCHECK_EQ(root()->document(), removedNode.document());
153 153
154 // Iterator is not affected if the removed node is the reference node and is the root. 154 // Iterator is not affected if the removed node is the reference node and is the root.
155 // or if removed node is not the reference node, or the ancestor of the refe rence node. 155 // or if removed node is not the reference node, or the ancestor of the refe rence node.
156 if (!removedNode.isDescendantOf(root())) 156 if (!removedNode.isDescendantOf(root()))
157 return; 157 return;
158 bool willRemoveReferenceNode = removedNode == referenceNode.node.get(); 158 bool willRemoveReferenceNode = removedNode == referenceNode.node.get();
159 bool willRemoveReferenceNodeAncestor = referenceNode.node && referenceNode.n ode->isDescendantOf(&removedNode); 159 bool willRemoveReferenceNodeAncestor = referenceNode.node && referenceNode.n ode->isDescendantOf(&removedNode);
160 if (!willRemoveReferenceNode && !willRemoveReferenceNodeAncestor) 160 if (!willRemoveReferenceNode && !willRemoveReferenceNodeAncestor)
161 return; 161 return;
162 162
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } 214 }
215 215
216 DEFINE_TRACE(NodeIterator) 216 DEFINE_TRACE(NodeIterator)
217 { 217 {
218 visitor->trace(m_referenceNode); 218 visitor->trace(m_referenceNode);
219 visitor->trace(m_candidateNode); 219 visitor->trace(m_candidateNode);
220 NodeIteratorBase::trace(visitor); 220 NodeIteratorBase::trace(visitor);
221 } 221 }
222 222
223 } // namespace blink 223 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698