Refactor PaintChunkProperties to use PropertyTreeState

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.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/PaintControllerPaintTest.h"
 
 #include "core/editing/FrameCaret.h"
 #include "core/editing/FrameSelection.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/line/InlineTextBox.h"
@@ skipping 185 matching lines @@
       TestDisplayItem(subDiv, backgroundType),
       TestDisplayItem(subDiv2, backgroundType),
       TestDisplayItem(div, DisplayItem::kEndCompositing),
       TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
       TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
       TestDisplayItem(layoutView(),
                       DisplayItem::clipTypeToEndClipType(
                           DisplayItem::kClipFrameToVisibleContentRect)));
 
   const PaintChunk& backgroundChunk = rootPaintController().paintChunks()[0];
-  EXPECT_TRUE(backgroundChunk.properties.scroll->isRoot());
+  EXPECT_TRUE(backgroundChunk.properties.propertyTreeState.scroll()->isRoot());
 
   const EffectPaintPropertyNode* effectNode = div.paintProperties()->effect();
   EXPECT_EQ(0.5f, effectNode->opacity());
   const PaintChunk& chunk = rootPaintController().paintChunks()[1];
   EXPECT_EQ(*div.layer(), chunk.id->client);
-  EXPECT_EQ(effectNode, chunk.properties.effect.get());
+  EXPECT_EQ(effectNode, chunk.properties.propertyTreeState.effect());
 
   EXPECT_FALSE(div.layer()->isJustCreated());
   // Client used by only paint chunks and non-cachaeable display items but not
   // by any cacheable display items won't be marked as validly cached.
   EXPECT_FALSE(rootPaintController().clientCacheIsValid(*div.layer()));
   EXPECT_FALSE(rootPaintController().clientCacheIsValid(div));
   EXPECT_TRUE(rootPaintController().clientCacheIsValid(subDiv));
 }
 
 TEST_F(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
@@ skipping 19 matching lines @@
       // one.
       TestDisplayItem(subDiv, backgroundType),
       TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
       TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
       TestDisplayItem(layoutView(),
                       DisplayItem::clipTypeToEndClipType(
                           DisplayItem::kClipFrameToVisibleContentRect)));
 }
 
 }  // namespace blink