Fixed for-loop increments in InsertionPoint::setDistributedNodes.

third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp

 /*
  * Copyright (C) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 {
     setHasCustomStyleCallbacks();
 }
 
 InsertionPoint::~InsertionPoint()
 {
 }
 
 void InsertionPoint::setDistributedNodes(DistributedNodes& distributedNodes)
 {
-    if (shouldUseFallbackElements()) {
-        for (Node* child = firstChild(); child; child = child->nextSibling())
-            child->lazyReattachIfAttached();
-    }
-
     // Attempt not to reattach nodes that would be distributed to the exact same
     // location by comparing the old and new distributions.
 
     size_t i = 0;
     size_t j = 0;
 
     for ( ; i < m_distributedNodes.size() && j < distributedNodes.size(); ++i, ++j) {
         if (m_distributedNodes.size() < distributedNodes.size()) {
             // If the new distribution is larger than the old one, reattach all nodes in
             // the new distribution that were inserted.
             for ( ; j < distributedNodes.size() && m_distributedNodes.at(i) != distributedNodes.at(j); ++j)
                 distributedNodes.at(j)->lazyReattachIfAttached();
+            if (j == distributedNodes.size())
+                break;
         } else if (m_distributedNodes.size() > distributedNodes.size()) {
             // If the old distribution is larger than the new one, reattach all nodes in
             // the old distribution that were removed.
             for ( ; i < m_distributedNodes.size() && m_distributedNodes.at(i) != distributedNodes.at(j); ++i)
                 m_distributedNodes.at(i)->lazyReattachIfAttached();
+            if (i == m_distributedNodes.size())
+                break;
         } else if (m_distributedNodes.at(i) != distributedNodes.at(j)) {
             // If both distributions are the same length reattach both old and new.
             m_distributedNodes.at(i)->lazyReattachIfAttached();
             distributedNodes.at(j)->lazyReattachIfAttached();
         }
     }
 
     // If we hit the end of either list above we need to reattach all remaining nodes.
 
     for ( ; i < m_distributedNodes.size(); ++i)
@@ skipping 34 matching lines @@
 }
 
 void InsertionPoint::willRecalcStyle(StyleRecalcChange change)
 {
     if (change < Inherit && styleChangeType() < SubtreeStyleChange)
         return;
     for (size_t i = 0; i < m_distributedNodes.size(); ++i)
         m_distributedNodes.at(i)->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::PropagateInheritChangeToDistributedNodes));
 }
 
-bool InsertionPoint::shouldUseFallbackElements() const
-{
-    return isActive() && !hasDistribution();
-}
-
 bool InsertionPoint::canBeActive() const
 {
     ShadowRoot* shadowRoot = containingShadowRoot();
     if (!shadowRoot)
         return false;
     if (shadowRoot->isV1())
         return false;
     return !Traversal<InsertionPoint>::firstAncestor(*this);
 }
 
@@ skipping 144 matching lines @@
         if (!insertionPoints)
             return;
         for (size_t i = 0; i < insertionPoints->size(); ++i)
             results.append(insertionPoints->at(i).get());
         ASSERT(current != insertionPoints->last().get());
         current = insertionPoints->last().get();
     }
 }
 
 } // namespace blink