Refactor PaintChunkProperties to use PropertyTreeState

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_compositor_frame_sink.h"
@@ skipping 16 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <memory>
 
 namespace blink {
 namespace {
 
 using ::blink::testing::createOpacityOnlyEffect;
 using ::testing::Pointee;
 
 PaintChunkProperties defaultPaintChunkProperties() {
-  PaintChunkProperties properties;
-  properties.transform = TransformPaintPropertyNode::root();
-  properties.clip = ClipPaintPropertyNode::root();
-  properties.effect = EffectPaintPropertyNode::root();
-  properties.scroll = ScrollPaintPropertyNode::root();
+  PropertyTreeState propertyTreeState(
+      TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
+      EffectPaintPropertyNode::root(), ScrollPaintPropertyNode::root());
+  PaintChunkProperties properties(propertyTreeState);
+
   return properties;

[Xianzhu, 2016/12/13 18:26:20]

Nit:

return PaintChunkProperties(propertyTreeState);

or

return PaintChunkProperties(PropertyTreeState(
    TransformPaintPropertyNode::root(), ...));

[chrishtr, 2016/12/13 21:03:40]

Done.

 }
 
 gfx::Transform translation(SkMScalar x, SkMScalar y) {
   gfx::Transform transform;
   transform.Translate(x, y);
   return transform;
 }
 
 class WebLayerTreeViewWithCompositorFrameSink
     : public WebLayerTreeViewImplForTesting {
@@ skipping 664 matching lines @@
             scrollTree.current_scroll_offset(contentLayerAt(1)->id()));
 
   EXPECT_TRUE(scrollNodeA.main_thread_scrolling_reasons &
               MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
   EXPECT_FALSE(scrollNodeB.main_thread_scrolling_reasons &
                MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects);
 }
 
 }  // namespace
 }  // namespace blink