Switch to shorter names for property tree storage and updates

third_party/WebKit/Source/core/paint/PaintLayerClipper.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 196 matching lines @@
   if (m_geometryMapper) {
     ClipRect clipRect = applyOverflowClipToBackgroundRectWithGeometryMapper(
         context, clipRectWithGeometryMapper(context, false));
 
     // The rect now needs to be transformed to the local space of this
     // PaintLayer.
     bool success = false;
     FloatRect clippedRectInLocalSpace =
         m_geometryMapper->mapRectToDestinationSpace(
             FloatRect(clipRect.rect()), clippingRootLayer->layoutObject()
-                                            ->objectPaintProperties()
+                                            ->paintProperties()
                                             ->localBorderBoxProperties()
                                             ->propertyTreeState,
             m_layer.layoutObject()
-                ->objectPaintProperties()
+                ->paintProperties()
                 ->localBorderBoxProperties()
                 ->propertyTreeState,
             success);
     DCHECK(success);
 
     return LayoutRect(clippedRectInLocalSpace);
   }
 
   LayoutRect layerBounds;
   ClipRect backgroundRect, foregroundRect;
@@ skipping 18 matching lines @@
       << "expected=" << expected.toString() << " actual=" << actual.toString()
 #endif
 
 void PaintLayerClipper::mapLocalToRootWithGeometryMapper(
     const ClipRectsContext& context,
     LayoutRect& layoutRect) const {
   DCHECK(m_geometryMapper);
   bool success;
 
   const ObjectPaintProperties::PropertyTreeStateWithOffset*
-      layerBorderBoxProperties = m_layer.layoutObject()
-                                     ->objectPaintProperties()
-                                     ->localBorderBoxProperties();
+      layerBorderBoxProperties =
+          m_layer.layoutObject()->paintProperties()->localBorderBoxProperties();
   FloatRect localRect(layoutRect);
   localRect.moveBy(FloatPoint(layerBorderBoxProperties->paintOffset));
 
   layoutRect = LayoutRect(m_geometryMapper->mapRectToDestinationSpace(
       localRect, layerBorderBoxProperties->propertyTreeState,
       context.rootLayer->layoutObject()
-          ->objectPaintProperties()
+          ->paintProperties()
           ->localBorderBoxProperties()
           ->propertyTreeState,
       success));
   DCHECK(success);
 }
 
 void PaintLayerClipper::calculateRectsWithGeometryMapper(
     const ClipRectsContext& context,
     const LayoutRect& paintDirtyRect,
     LayoutRect& layerBounds,
@@ skipping 149 matching lines @@
 
   return parentRects.overflowClipRect();
 }
 
 ClipRect PaintLayerClipper::clipRectWithGeometryMapper(
     const ClipRectsContext& context,
     bool isForeground) const {
   DCHECK(m_geometryMapper);
   LayoutRect source(LayoutRect::infiniteIntRect());
   bool success = false;
-  const ObjectPaintProperties* properties =
-      m_layer.layoutObject()->objectPaintProperties();
+  const auto* properties = m_layer.layoutObject()->paintProperties();
   PropertyTreeState propertyTreeState =
       properties->localBorderBoxProperties()->propertyTreeState;
 
   if (properties->cssClip())
     propertyTreeState.setClip(properties->cssClip());
 
   if (isForeground && shouldClipOverflow(context) && properties->overflowClip())
     propertyTreeState.setClip(properties->overflowClip());
 
-  const ObjectPaintProperties* ancestorProperties =
-      context.rootLayer->layoutObject()->objectPaintProperties();
+  const auto* ancestorProperties =
+      context.rootLayer->layoutObject()->paintProperties();
   PropertyTreeState destinationPropertyTreeState =
       ancestorProperties->localBorderBoxProperties()->propertyTreeState;
   if (!context.rootLayer->clipper().shouldRespectOverflowClip(context)) {
     if (ancestorProperties->overflowClip())
       destinationPropertyTreeState.setClip(ancestorProperties->overflowClip());
   }
   FloatRect clippedRectInRootLayerSpace =
       m_geometryMapper->mapToVisualRectInDestinationSpace(
           FloatRect(source), propertyTreeState, destinationPropertyTreeState,
           success);
@@ skipping 94 matching lines @@
     const LayoutSize& subpixelAccumulation) const {
   DCHECK(!m_geometryMapper);
   ClipRectsContext context(rootLayer, PaintingClipRects,
                            IgnoreOverlayScrollbarSize, subpixelAccumulation);
   if (respectOverflowClip == IgnoreOverflowClip)
     context.setIgnoreOverflowClip();
   return getClipRects(context);
 }
 
 }  // namespace blink