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

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

Issue 2149893003: Rename Node::inShadowIncludingDocument() to Node::isConnected() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Created 4 years, 5 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 assertPostcondition(previousSibling); 272 assertPostcondition(previousSibling);
273 return previousSibling; 273 return previousSibling;
274 } 274 }
275 return previousAncestorSiblingPostOrder(current, stayWithin); 275 return previousAncestorSiblingPostOrder(current, stayWithin);
276 } 276 }
277 277
278 bool FlatTreeTraversal::isDescendantOf(const Node& node, const Node& other) 278 bool FlatTreeTraversal::isDescendantOf(const Node& node, const Node& other)
279 { 279 {
280 assertPrecondition(node); 280 assertPrecondition(node);
281 assertPrecondition(other); 281 assertPrecondition(other);
282 if (!hasChildren(other) || node.inShadowIncludingDocument() != other.inShado wIncludingDocument()) 282 if (!hasChildren(other) || node.isConnected() != other.isConnected())
283 return false; 283 return false;
284 for (const ContainerNode* n = traverseParent(node); n; n = traverseParent(*n )) { 284 for (const ContainerNode* n = traverseParent(node); n; n = traverseParent(*n )) {
285 if (n == other) 285 if (n == other)
286 return true; 286 return true;
287 } 287 }
288 return false; 288 return false;
289 } 289 }
290 290
291 Node* FlatTreeTraversal::commonAncestor(const Node& nodeA, const Node& nodeB) 291 Node* FlatTreeTraversal::commonAncestor(const Node& nodeA, const Node& nodeB)
292 { 292 {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 Node& FlatTreeTraversal::lastWithinOrSelf(const Node& node) 352 Node& FlatTreeTraversal::lastWithinOrSelf(const Node& node)
353 { 353 {
354 assertPrecondition(node); 354 assertPrecondition(node);
355 Node* lastDescendant = lastWithin(node); 355 Node* lastDescendant = lastWithin(node);
356 Node& result = lastDescendant ? *lastDescendant : const_cast<Node&>(node); 356 Node& result = lastDescendant ? *lastDescendant : const_cast<Node&>(node);
357 assertPostcondition(&result); 357 assertPostcondition(&result);
358 return result; 358 return result;
359 } 359 }
360 360
361 } // namespace blink 361 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698