Refactor PaintChunkProperties to use PropertyTreeState

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/LayoutView.h"
 #include "core/paint/ClipPathClipper.h"
 #include "core/paint/FilterPainter.h"
@@ skipping 251 matching lines @@
       m_paintLayer.layoutObject() &&
       m_paintLayer.layoutObject()->isLayoutView()) {
     const auto* objectPaintProperties =
         m_paintLayer.layoutObject()->paintProperties();
     DCHECK(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();
-    properties.effect = localBorderBoxProperties.propertyTreeState.effect();
+    properties.propertyTreeState = localBorderBoxProperties.propertyTreeState;
     properties.backfaceHidden =
         m_paintLayer.layoutObject()->hasHiddenBackface();
     scopedPaintChunkProperties.emplace(context.getPaintController(),
                                        m_paintLayer, properties);
   }
 
   DCHECK(m_paintLayer.isSelfPaintingLayer() ||
          m_paintLayer.hasSelfPaintingLayerDescendant());
   DCHECK(!(paintFlags & PaintLayerAppliedTransform));
 
@@ skipping 217 matching lines @@
                m_paintLayer.layoutObject() &&
                m_paintLayer.layoutObject()->isLayoutView()));
       const auto* objectPaintProperties =
           m_paintLayer.layoutObject()->paintProperties();
       DCHECK(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();
-      properties.effect = localBorderBoxProperties.propertyTreeState.effect();
+      properties.propertyTreeState = localBorderBoxProperties.propertyTreeState;
       properties.backfaceHidden =
           m_paintLayer.layoutObject()->hasHiddenBackface();
       contentScopedPaintChunkProperties.emplace(context.getPaintController(),
                                                 m_paintLayer, properties);
     }
 
     bool isPaintingRootLayer = (&m_paintLayer) == paintingInfo.rootLayer;
     bool shouldPaintBackground =
         shouldPaintContent && !selectionOnly &&
         (isPaintingCompositedBackground ||
@@ skipping 629 matching lines @@
 
   PaintLayerPaintingInfo paintingInfo(&m_paintLayer,
                                       LayoutRect(enclosingIntRect(damageRect)),
                                       paintFlags, LayoutSize());
   paintLayer(context, paintingInfo, PaintLayerPaintingOverlayScrollbars);
 
   m_paintLayer.setContainsDirtyOverlayScrollbars(false);
 }
 
 }  // namespace blink