Remove caching of contents paint properties

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

 // Copyright 2015 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/PaintPropertyTreeBuilderTest.h"
 
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
@@ skipping 67 matching lines @@
   RenderingTest::TearDown();
 
   Settings::SetMockScrollbarsEnabled(false);
 }
 
 #define CHECK_VISUAL_RECT(expected, sourceObject, ancestorObject, slopFactor) \
   do {                                                                        \
     if ((sourceObject)->HasLayer() && (ancestorObject)->HasLayer()) {         \
       LayoutRect source((sourceObject)->LocalVisualRect());                   \
       source.MoveBy((sourceObject)->PaintOffset());                           \
-      const auto& contents_properties =                                       \
-          *(ancestorObject)->ContentsProperties();                            \
+      auto contents_properties = (ancestorObject)->ContentsProperties();      \
       FloatClipRect actual_float_rect((FloatRect(source)));                   \
       GeometryMapper::SourceToDestinationVisualRect(                          \
           *(sourceObject)->LocalBorderBoxProperties(), contents_properties,   \
           actual_float_rect);                                                 \
       LayoutRect actual(actual_float_rect.Rect());                            \
       actual.MoveBy(-(ancestorObject)->PaintOffset());                        \
       SCOPED_TRACE("GeometryMapper: ");                                       \
       EXPECT_EQ(expected, actual);                                            \
     }                                                                         \
                                                                               \
@@ skipping 2294 matching lines @@
   LayoutObject* child =
       GetDocument().GetElementById("child")->GetLayoutObject();
 
   // No scroll translation because the document does not scroll (not enough
   // content).
   EXPECT_TRUE(!FrameScrollTranslation());
   EXPECT_EQ(FramePreTranslation(),
             clipper->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(FrameContentClip(), clipper->LocalBorderBoxProperties()->Clip());
 
-  const auto& contents_properties = *clipper->ContentsProperties();
+  auto contents_properties = clipper->ContentsProperties();
   EXPECT_EQ(LayoutPoint(30, 20), clipper->PaintOffset());
   EXPECT_EQ(FramePreTranslation(), contents_properties.Transform());
   EXPECT_EQ(clip_properties->OverflowClip(), contents_properties.Clip());
 
   EXPECT_EQ(FramePreTranslation(),
             child->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(clip_properties->OverflowClip(),
             child->LocalBorderBoxProperties()->Clip());
 
   EXPECT_NE(nullptr, child->LocalBorderBoxProperties()->Effect());
@@ skipping 15 matching lines @@
   LayoutObject* child =
       GetDocument().GetElementById("child")->GetLayoutObject();
 
   // No scroll translation because the document does not scroll (not enough
   // content).
   EXPECT_TRUE(!FrameScrollTranslation());
   EXPECT_EQ(FramePreTranslation(),
             clipper->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(FrameContentClip(), clipper->LocalBorderBoxProperties()->Clip());
 
-  const auto& contents_properties = *clipper->ContentsProperties();
+  auto contents_properties = clipper->ContentsProperties();
   EXPECT_EQ(LayoutPoint(30, 20), clipper->PaintOffset());
   EXPECT_EQ(FramePreTranslation(), contents_properties.Transform());
   EXPECT_EQ(clip_properties->OverflowClip(), contents_properties.Clip());
 
   EXPECT_EQ(FramePreTranslation(),
             child->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(clip_properties->OverflowClip(),
             child->LocalBorderBoxProperties()->Clip());
 
   EXPECT_NE(nullptr, child->LocalBorderBoxProperties()->Effect());
@@ skipping 19 matching lines @@
   LayoutBoxModelObject* clipper =
       ToLayoutBoxModelObject(clipper_element->GetLayoutObject());
   const ObjectPaintProperties* clip_properties = clipper->PaintProperties();
   LayoutObject* child =
       GetDocument().GetElementById("child")->GetLayoutObject();
 
   EXPECT_EQ(FrameScrollTranslation(),
             clipper->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(FrameContentClip(), clipper->LocalBorderBoxProperties()->Clip());
 
-  const auto& contents_properties = *clipper->ContentsProperties();
+  auto contents_properties = clipper->ContentsProperties();
   EXPECT_EQ(LayoutPoint(30, 20), clipper->PaintOffset());
   EXPECT_EQ(clip_properties->ScrollTranslation(),
             contents_properties.Transform());
   EXPECT_EQ(clip_properties->OverflowClip(), contents_properties.Clip());
 
   EXPECT_EQ(clip_properties->ScrollTranslation(),
             child->LocalBorderBoxProperties()->Transform());
   EXPECT_EQ(clip_properties->OverflowClip(),
             child->LocalBorderBoxProperties()->Clip());
 
@@ skipping 65 matching lines @@
 
   // No scroll translation because the document does not scroll (not enough
   // content).
   EXPECT_TRUE(!FrameScrollTranslation());
   EXPECT_EQ(FramePreTranslation(),
             clipper->LocalBorderBoxProperties()->Transform());
   // CSS clip on an element causes it to clip itself, not just descendants.
   EXPECT_EQ(clip_properties->CssClip(),
             clipper->LocalBorderBoxProperties()->Clip());
 
-  const auto& contents_properties = *clipper->ContentsProperties();
+  auto contents_properties = clipper->ContentsProperties();
   EXPECT_EQ(LayoutPoint(30, 20), clipper->PaintOffset());
   EXPECT_EQ(FramePreTranslation(), contents_properties.Transform());
   EXPECT_EQ(clip_properties->CssClip(), contents_properties.Clip());
 
   CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 500), child, clipper);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
        SvgLocalToBorderBoxTransformContentsTreeState) {
   SetBodyInnerHTML(
@@ skipping 12 matching lines @@
       "100 100'>"
       "  <rect id='rect' width='100px' height='100px' />"
       "</svg>");
 
   LayoutObject& svg_with_view_box =
       *GetDocument().GetElementById("svgWithViewBox")->GetLayoutObject();
   EXPECT_EQ(FramePreTranslation(),
             svg_with_view_box.LocalBorderBoxProperties()->Transform());
 
   EXPECT_EQ(LayoutPoint(30, 20), svg_with_view_box.PaintOffset());
-  const auto& contents_properties = *svg_with_view_box.ContentsProperties();
+  auto contents_properties = svg_with_view_box.ContentsProperties();
   EXPECT_EQ(FramePreTranslation(), contents_properties.Transform());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowHiddenScrollProperties) {
   SetBodyInnerHTML(
       "<style>"
       "  body {"
       "    margin: 0px;"
       "  }"
       "  #overflowHidden {"
@@ skipping 851 matching lines @@
 
   LayoutObject& svg_root =
       *GetDocument().GetElementById("svgroot")->GetLayoutObject();
   const ObjectPaintProperties* svg_root_properties = svg_root.PaintProperties();
   EXPECT_TRUE(svg_root_properties->Effect());
   EXPECT_EQ(EffectPaintPropertyNode::Root(),
             svg_root_properties->Effect()->Parent());
 }
 
 }  // namespace blink