Switch to shorter names for property tree storage and updates

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/PaintLayerPainter.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/ClipPathClipper.h"
@@ skipping 402 matching lines @@
 
   {  // Begin block for the lifetime of any filter.
     FilterPainter filterPainter(m_paintLayer, context, offsetFromRoot,
                                 layerFragments.isEmpty()
                                     ? ClipRect()
                                     : layerFragments[0].backgroundRect,
                                 localPaintingInfo, paintFlags);
 
     Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-      const ObjectPaintProperties* objectPaintProperties =
-          m_paintLayer.layoutObject()->objectPaintProperties();
+      const auto* objectPaintProperties =
+          m_paintLayer.layoutObject()->paintProperties();
       ASSERT(objectPaintProperties &&
              objectPaintProperties->localBorderBoxProperties());
       PaintChunkProperties properties(
           context.getPaintController().currentPaintChunkProperties());
       auto& localBorderBoxProperties =
           *objectPaintProperties->localBorderBoxProperties();
       properties.transform =
           localBorderBoxProperties.propertyTreeState.transform();
       properties.scroll = localBorderBoxProperties.propertyTreeState.scroll();
       properties.clip = localBorderBoxProperties.propertyTreeState.clip();
@@ skipping 424 matching lines @@
 
     clipRecorder.emplace(context, *m_paintLayer.layoutObject(), clipType,
                          clipRect, &paintingInfo, fragment.paginationOffset,
                          paintFlags, clippingRule);
   }
 
   LayoutRect newCullRect(clipRect.rect());
   Optional<ScrollRecorder> scrollRecorder;
   LayoutPoint paintOffset = -m_paintLayer.layoutBoxLocation();
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    const ObjectPaintProperties* objectPaintProperties =
-        m_paintLayer.layoutObject()->objectPaintProperties();
+    const auto* objectPaintProperties =
+        m_paintLayer.layoutObject()->paintProperties();
     ASSERT(objectPaintProperties &&
            objectPaintProperties->localBorderBoxProperties());
     paintOffset +=
         toSize(objectPaintProperties->localBorderBoxProperties()->paintOffset);
     newCullRect.move(paintingInfo.scrollOffsetAccumulation);
   } else {
     paintOffset += toSize(fragment.layerBounds.location());
     if (!paintingInfo.scrollOffsetAccumulation.isZero()) {
       // As a descendant of the root layer, m_paintLayer's painting is not
       // controlled by the ScrollRecorders created by BlockPainter of the
@@ skipping 190 matching lines @@
 
   PaintLayerPaintingInfo paintingInfo(&m_paintLayer,
                                       LayoutRect(enclosingIntRect(damageRect)),
                                       paintFlags, LayoutSize());
   paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars);
 
   m_paintLayer.setContainsDirtyOverlayScrollbars(false);
 }
 
 }  // namespace blink