Store local border box property cache outside ObjectPaintProperties

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 320 matching lines @@
 
 bool PaintLayer::sticksToViewport() const {
   if (layoutObject().style()->position() != EPosition::kFixed &&
       layoutObject().style()->position() != EPosition::kSticky)
     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 auto* viewBorderBoxProperties =
+        layoutObject().view()->localBorderBoxProperties();
     const ScrollPaintPropertyNode* ancestorTargetScrollNode;
     if (layoutObject().style()->position() == EPosition::kFixed) {
-      ancestorTargetScrollNode = viewProperties->localBorderBoxProperties()
-                                     ->transform()
-                                     ->findEnclosingScrollNode();
+      ancestorTargetScrollNode =
+          viewBorderBoxProperties->transform()->findEnclosingScrollNode();
     } else {
-      ancestorTargetScrollNode = viewProperties->contentsProperties()
+      ancestorTargetScrollNode = layoutObject()
+                                     .view()
+                                     ->contentsProperties()
                                      ->transform()
                                      ->findEnclosingScrollNode();
     }
 
-    const auto* properties = layoutObject().paintProperties();
-    const auto* transform = properties->localBorderBoxProperties()->transform();
+    const auto* transform =
+        layoutObject().localBorderBoxProperties()->transform();
     return transform->findEnclosingScrollNode() == ancestorTargetScrollNode;
   }
 
   return (layoutObject().style()->position() == EPosition::kFixed &&
           layoutObject().containerForFixedPosition() ==
               layoutObject().view()) ||
          (layoutObject().style()->position() == EPosition::kSticky &&
           (!ancestorScrollingLayer() || ancestorScrollingLayer() == root()));
 }
 
@@ skipping 2873 matching lines @@
 }
 
 void showLayerTree(const blink::LayoutObject* layoutObject) {
   if (!layoutObject) {
     LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
     return;
   }
   showLayerTree(layoutObject->enclosingLayer());
 }
 #endif