Refactor PaintChunkProperties to use PropertyTreeState

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

Index: third_party/WebKit/Source/core/paint/FramePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/FramePainter.cpp b/third_party/WebKit/Source/core/paint/FramePainter.cpp
index dc25b19ee9d4230bd83e3b011e6e8dbaaf38a45e..d05be3f3feffb4771b9085d8c12d1b4bdf159621 100644
--- a/third_party/WebKit/Source/core/paint/FramePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
@@ -57,10 +57,7 @@ void FramePainter::paint(GraphicsContext& context,
               m_frameView->totalPropertyTreeStateForContents()) {
         PaintChunkProperties properties(
             context.getPaintController().currentPaintChunkProperties());
-        properties.transform = contentsState->transform();
-        properties.clip = contentsState->clip();
-        properties.effect = contentsState->effect();
-        properties.scroll = contentsState->scroll();
+        properties.propertyTreeState = *contentsState;
         scopedPaintChunkProperties.emplace(context.getPaintController(),
                                            *frameView().layoutView(),
                                            properties);
@@ -101,13 +98,15 @@ void FramePainter::paint(GraphicsContext& context,
         // properties. This prevents the scrollbars from scrolling, for example.
         PaintChunkProperties properties(
             context.getPaintController().currentPaintChunkProperties());
-        properties.transform = m_frameView->preTranslation();
-        properties.clip = m_frameView->contentClip()->parent();
-        properties.effect = contentsState->effect();
+        properties.propertyTreeState.setTransform(
+            m_frameView->preTranslation());
+        properties.propertyTreeState.setClip(
+            m_frameView->contentClip()->parent());
+        properties.propertyTreeState.setEffect(contentsState->effect());
         auto* scrollBarScroll = contentsState->scroll();
         if (m_frameView->scroll())
           scrollBarScroll = m_frameView->scroll()->parent();
-        properties.scroll = scrollBarScroll;
+        properties.propertyTreeState.setScroll(scrollBarScroll);
         scopedPaintChunkProperties.emplace(context.getPaintController(),
                                            *frameView().layoutView(),
                                            properties);