Ensure PaintArtifactCompositor assigns a scroll tree index to all cc layers

third_party/WebKit/Source/core/paint/PaintLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 310 matching lines @@
     // a self-painting descendant in this case, there is no need to dirty our
     // ancestors further.
     if (layer->isSelfPaintingLayer()) {
       DCHECK(!parent() || parent()->m_hasSelfPaintingLayerDescendantDirty ||
              parent()->m_hasSelfPaintingLayerDescendant);
       break;
     }
   }
 }
 
-static const ScrollPaintPropertyNode* nearestScrollNode(
-    const TransformPaintPropertyNode* transform) {
-  if (const auto* scrollNode = transform->scrollNode())
-    return scrollNode;
-  for (const auto* ancestor = transform->parent(); ancestor;
-       ancestor = ancestor->parent()) {
-    if (const auto* scrollNode = ancestor->scrollNode())
-      return scrollNode;
-  }
-  // The root transform node references the root scroll node so a scroll node
-  // should always exist.
-  NOTREACHED();
-  return nullptr;
-}
-
 bool PaintLayer::sticksToViewport() const {
   if (layoutObject()->style()->position() != FixedPosition &&
       layoutObject()->style()->position() != StickyPosition)
     return false;
 
   // TODO(pdr): This approach of calculating the nearest scroll node is O(n).
   // An option for improving this is to cache the nearest scroll node in
   // the local border box properties.
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    const auto* viewProperties = layoutObject()->view()->paintProperties();
     const ScrollPaintPropertyNode* ancestorTargetScrollNode;
     if (layoutObject()->style()->position() == FixedPosition) {
-      ancestorTargetScrollNode =
-          nearestScrollNode(layoutObject()
-                                ->view()
-                                ->paintProperties()
-                                ->localBorderBoxProperties()
-                                ->transform());
+      ancestorTargetScrollNode = viewProperties->localBorderBoxProperties()
+                                     ->transform()
+                                     ->findEnclosingScrollNode();
     } else {
-      ancestorTargetScrollNode = nearestScrollNode(layoutObject()
-                                                       ->view()
-                                                       ->paintProperties()
-                                                       ->contentsProperties()
-                                                       ->transform());
+      ancestorTargetScrollNode = viewProperties->contentsProperties()
+                                     ->transform()
+                                     ->findEnclosingScrollNode();
     }
 
-    return nearestScrollNode(layoutObject()
-                                 ->paintProperties()
-                                 ->localBorderBoxProperties()
-                                 ->transform()) == ancestorTargetScrollNode;
+    const auto* properties = layoutObject()->paintProperties();
+    const auto* transform = properties->localBorderBoxProperties()->transform();
+    return transform->findEnclosingScrollNode() == ancestorTargetScrollNode;
   }
 
   return (layoutObject()->style()->position() == FixedPosition &&
           layoutObject()->containerForFixedPosition() ==
               layoutObject()->view()) ||
          (layoutObject()->style()->position() == StickyPosition &&
           (!ancestorScrollingLayer() || ancestorScrollingLayer() == root()));
 }
 
 bool PaintLayer::scrollsWithRespectTo(const PaintLayer* other) const {
@@ skipping 2827 matching lines @@
 }
 
 void showLayerTree(const blink::LayoutObject* layoutObject) {
   if (!layoutObject) {
     LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
     return;
   }
   showLayerTree(layoutObject->enclosingLayer());
 }
 #endif