Introduce NodeTraversal::ancestorsOf() and inclusiveAncestors() for range-based for loop

third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp

 /*
  * Copyright (C) 2012 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 33 matching lines @@
     HeapVector<Member<ContainerNode>> nodesToRemove;
 
     // Walk through the inserted nodes, to see if there are elements that could be removed
     // without affecting the style. The goal is to produce leaner markup even when starting
     // from a verbose fragment.
     // We look at inline elements as well as non top level divs that don't have attributes.
     for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node = NodeTraversal::next(*node)) {
         if (node->hasChildren() || (node->isTextNode() && node->nextSibling()))
             continue;
 
-        ContainerNode* startingNode = node->parentNode();
+        ContainerNode* const startingNode = node->parentNode();
         if (!startingNode)
             continue;
         const ComputedStyle* startingStyle = startingNode->computedStyle();
         if (!startingStyle)
             continue;
         ContainerNode* currentNode = startingNode;
         ContainerNode* topNodeWithStartingStyle = nullptr;
         while (currentNode != rootNode) {
             if (currentNode->parentNode() != rootNode && isRemovableBlock(currentNode))
                 nodesToRemove.append(currentNode);
 
             currentNode = currentNode->parentNode();
             if (!currentNode)
                 break;
 
             if (!currentNode->layoutObject() || !currentNode->layoutObject()->isLayoutInline() || toLayoutInline(currentNode->layoutObject())->alwaysCreateLineBoxes())
                 continue;
 
             if (currentNode->firstChild() != currentNode->lastChild()) {
                 topNodeWithStartingStyle = 0;
                 break;
             }
 
             if (!currentNode->computedStyle()->visualInvalidationDiff(*startingStyle).hasDifference())
                 topNodeWithStartingStyle = currentNode;
 
         }
         if (topNodeWithStartingStyle) {
-            for (ContainerNode* node = startingNode; node != topNodeWithStartingStyle; node = node->parentNode())
-                nodesToRemove.append(node);
+            for (Node& node : NodeTraversal::inclusiveAncestorsOf(*startingNode)) {
+                if (node == topNodeWithStartingStyle)
+                    break;
+                nodesToRemove.append(static_cast<ContainerNode*>(&node));
+            }
         }
     }
 
     // we perform all the DOM mutations at once.
     for (size_t i = 0; i < nodesToRemove.size(); ++i) {
         // FIXME: We can do better by directly moving children from nodesToRemove[i].
         int numPrunedAncestors = pruneSubsequentAncestorsToRemove(nodesToRemove, i, editingState);
         if (editingState->isAborted())
             return;
         if (numPrunedAncestors < 0)
@@ skipping 36 matching lines @@
 }
 
 DEFINE_TRACE(SimplifyMarkupCommand)
 {
     visitor->trace(m_firstNode);
     visitor->trace(m_nodeAfterLast);
     CompositeEditCommand::trace(visitor);
 }
 
 } // namespace blink