Refactor to centralize code which decides whether ObjectPaintProperties are needed.

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

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
index b6f38d98c1baa2425e80fff94d7eae8756369b86..ef560ee33e9182ae0efd7dfd6d94dccca9d56313 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -378,8 +378,7 @@ TEST_P(PaintPropertyTreeBuilderTest, Transform) {
       HTMLNames::styleAttr,
       "margin-left: 50px; margin-top: 100px; width: 400px; height: 300px;");
   GetDocument().View()->UpdateAllLifecyclePhases();
-  EXPECT_EQ(nullptr,
-            transform->GetLayoutObject()->PaintProperties()->Transform());
+  EXPECT_EQ(nullptr, transform->GetLayoutObject()->PaintProperties());
 
   transform->setAttribute(
       HTMLNames::styleAttr,
@@ -479,8 +478,7 @@ TEST_P(PaintPropertyTreeBuilderTest, WillChangeTransform) {
       HTMLNames::styleAttr,
       "margin-left: 50px; margin-top: 100px; width: 400px; height: 300px;");
   GetDocument().View()->UpdateAllLifecyclePhases();
-  EXPECT_EQ(nullptr,
-            transform->GetLayoutObject()->PaintProperties()->Transform());
+  EXPECT_EQ(nullptr, transform->GetLayoutObject()->PaintProperties());
 
   transform->setAttribute(
       HTMLNames::styleAttr,
@@ -1022,8 +1020,9 @@ TEST_P(PaintPropertyTreeBuilderTest, TransformNodesAcrossSVGHTMLBoundary) {
   EXPECT_EQ(TransformationMatrix().Translate3d(3, 4, 5),
             div_with_transform_properties->Transform()->Matrix());
   // Ensure the div's transform node is a child of the svg's transform node.
+  // (The first parent is the SVG to local border box transform.)
   EXPECT_EQ(svg_with_transform_properties->Transform(),
-            div_with_transform_properties->Transform()->Parent());
+            div_with_transform_properties->Transform()->Parent()->Parent());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
@@ -1052,8 +1051,9 @@ TEST_P(PaintPropertyTreeBuilderTest,
       container.PaintProperties();
   EXPECT_EQ(TransformationMatrix().Translate(20, 30),
             container_properties->Transform()->Matrix());
+  // (The first parent is the SVG to local border box transform.)
   EXPECT_EQ(svg_properties->Transform(),
-            container_properties->Transform()->Parent());
+            container_properties->Transform()->Parent()->Parent());
 
   Element* fixed = GetDocument().GetElementById("fixed");
   // Ensure the fixed position element is rooted at the nearest transform
@@ -1943,8 +1943,8 @@ TEST_P(PaintPropertyTreeBuilderTest, SvgPixelSnappingShouldResetPaintOffset) {
   EXPECT_EQ(TransformationMatrix(),
             svg_with_transform_properties->Transform()->Matrix());
   EXPECT_EQ(LayoutPoint(FloatPoint(0.1, 0)), svg_with_transform.PaintOffset());
-  EXPECT_EQ(nullptr,
-            svg_with_transform_properties->SvgLocalToBorderBoxTransform());
+  EXPECT_FALSE(svg_with_transform_properties->SvgLocalToBorderBoxTransform() ==
+               nullptr);
 
   LayoutObject& rect_with_transform =
       *GetDocument().GetElementById("rect")->GetLayoutObject();
@@ -1955,8 +1955,9 @@ TEST_P(PaintPropertyTreeBuilderTest, SvgPixelSnappingShouldResetPaintOffset) {
 
   // Ensure there is no PaintOffset transform between the rect and the svg's
   // transform.
+  // (The first parent is the SVG to border box transform.)
   EXPECT_EQ(svg_with_transform_properties->Transform(),
-            rect_with_transform_properties->Transform()->Parent());
+            rect_with_transform_properties->Transform()->Parent()->Parent());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, SvgRootAndForeignObjectPixelSnapping) {
@@ -2335,8 +2336,7 @@ TEST_P(PaintPropertyTreeBuilderTest, CachedProperties) {
   EXPECT_EQ(a_properties, a->GetLayoutObject()->PaintProperties());
   EXPECT_EQ(a_transform_node, a_properties->Transform());
 
-  EXPECT_EQ(b_properties, b->GetLayoutObject()->PaintProperties());
-  EXPECT_EQ(nullptr, b_properties->Transform());
+  EXPECT_EQ(nullptr, b->GetLayoutObject()->PaintProperties());
 
   EXPECT_EQ(c_properties, c->GetLayoutObject()->PaintProperties());
   EXPECT_EQ(c_transform_node, c_properties->Transform());
@@ -2358,6 +2358,7 @@ TEST_P(PaintPropertyTreeBuilderTest, CachedProperties) {
   EXPECT_EQ(a_properties, a->GetLayoutObject()->PaintProperties());
   EXPECT_EQ(a_transform_node, a_properties->Transform());
 
+  b_properties = b->GetLayoutObject()->PaintProperties();
   EXPECT_EQ(b_properties, b->GetLayoutObject()->PaintProperties());
   b_transform_node = b_properties->Transform();
   EXPECT_EQ(TransformationMatrix().Translate(4, 5), b_transform_node->Matrix());