Refactor PaintChunkProperties to use PropertyTreeState

third_party/WebKit/Source/core/paint/FramePainter.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/FramePainter.h"
 
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ skipping 39 matching lines @@
     // TODO(pdr): Creating frame paint properties here will not be needed once
     // settings()->rootLayerScrolls() is enabled.
     // TODO(pdr): Make this conditional on the rootLayerScrolls setting.
     Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
         !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       if (const PropertyTreeState* contentsState =
               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);
       }
     }
 
     TransformRecorder transformRecorder(
         context, *frameView().layoutView(),
         AffineTransform::translation(frameView().x() - frameView().scrollX(),
                                      frameView().y() - frameView().scrollY()));
@@ skipping 20 matching lines @@
 
     Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
       if (const PropertyTreeState* contentsState =
               m_frameView->totalPropertyTreeStateForContents()) {
         // The scrollbar's property nodes are similar to the frame view's
         // contents state but we want to exclude the content-specific
         // 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);
       }
     }
 
     TransformRecorder transformRecorder(
         context, *frameView().layoutView(),
         AffineTransform::translation(frameView().x(), frameView().y()));
 
@@ skipping 130 matching lines @@
 
   bar.paint(context, CullRect(rect));
 }
 
 const FrameView& FramePainter::frameView() {
   DCHECK(m_frameView);
   return *m_frameView;
 }
 
 }  // namespace blink