[SPInvalidation] Fix paint offset issue of descendants of composited svg root

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/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
 #include "platform/graphics/paint/GeometryMapper.h"
@@ skipping 77 matching lines @@
         Settings::setMockScrollbarsEnabled(false);
     }
 };
 
 #define CHECK_VISUAL_RECT(expected, sourceLayoutObject, ancestorLayoutObject, slopFactor) \
 do { \
     GeometryMapper geometryMapper; \
     LayoutRect source((sourceLayoutObject)->localOverflowRectForPaintInvalidation()); \
     source.moveBy((sourceLayoutObject)->objectPaintProperties()->localBorderBoxProperties()->paintOffset); \
     bool success = false; \
-    GeometryPropertyTreeState contentsProperties; \
-    (ancestorLayoutObject)->objectPaintProperties()->getContentsProperties(contentsProperties); \
-    FloatRect actual = geometryMapper.mapToVisualRectInDestinationSpace( \
+    GeometryPropertyTreeState contentsTreeState; \
+    LayoutPoint paintOffsetFromContentsTreeState; \
+    (ancestorLayoutObject)->objectPaintProperties()->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState); \
+    LayoutRect actual = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace( \
         FloatRect(source), \
         (sourceLayoutObject)->objectPaintProperties()->localBorderBoxProperties()->geometryPropertyTreeState, \
-        contentsProperties, success); \
+        contentsTreeState, success)); \
     ASSERT_TRUE(success); \
-    EXPECT_EQ(expected, LayoutRect(actual)) << "GeometryMapper: expected: " << expected.toString() << ", actual: " << actual.toString(); \
+    actual.moveBy(-paintOffsetFromContentsTreeState); \
+    EXPECT_EQ(expected, actual) << "GeometryMapper: expected: " << expected.toString() << ", actual: " << actual.toString(); \
 \
     if (slopFactor == LayoutUnit::max()) \
         break; \
     LayoutRect slowPathRect = (sourceLayoutObject)->localOverflowRectForPaintInvalidation(); \
     (sourceLayoutObject)->mapToVisualRectInAncestorSpace(ancestorLayoutObject, slowPathRect); \
     if (slopFactor) { \
         LayoutRect inflatedActual = LayoutRect(actual); \
         inflatedActual.inflate(slopFactor); \
         SCOPED_TRACE(String::format("Old path rect: %s, Actual: %s, Inflated actual: %s", slowPathRect.toString().ascii().data(), actual.toString().ascii().data(), inflatedActual.toString().ascii().data())); \
         EXPECT_TRUE(slowPathRect.contains(LayoutRect(actual))); \
@@ skipping 1491 matching lines @@
 
     EXPECT_EQ(cProperties, c->layoutObject()->objectPaintProperties());
     EXPECT_EQ(cTransformNode, cProperties->transform());
     EXPECT_EQ(bTransformNode, cTransformNode->parent());
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(33, 44, 50, 60), a->layoutObject(), frameView->layoutView());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(37, 49, 50, 20), b->layoutObject(), frameView->layoutView());
     CHECK_EXACT_VISUAL_RECT(LayoutRect(114, 137, 10, 20), c->layoutObject(), frameView->layoutView());
 }
 
-TEST_P(PaintPropertyTreeBuilderTest, OverflowClipContentsProperties)
+TEST_P(PaintPropertyTreeBuilderTest, OverflowClipContentsTreeState)
 {
     // This test verifies the tree builder correctly computes and records the property tree context
     // for a (pseudo) stacking context that is scrolled by a containing block that is not one of
     // the painting ancestors.
     setBodyInnerHTML(
-        "<style>body { margin: 0; }</style>"
+        "<style>body { margin: 20px 30px; }</style>"
         "<div id='clipper' style='overflow:hidden; width:400px; height:300px;'>"
         "  <div id='child' style='position:relative; width:500px; height: 600px;'></div>"
         "</div>"
     );
 
     LayoutBoxModelObject* clipper = toLayoutBoxModelObject(document().getElementById("clipper")->layoutObject());
     const ObjectPaintProperties* clipProperties = clipper->objectPaintProperties();
     LayoutObject* child = document().getElementById("child")->layoutObject();
     const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
     // No scroll translation because the document does not scroll (not enough content).
     EXPECT_TRUE(!frameScrollTranslation());
     EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
-    GeometryPropertyTreeState contentsProperties;
-    clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(framePreTranslation(), contentsProperties.transform);
-    EXPECT_EQ(clipProperties->overflowClip(), contentsProperties.clip);
+    GeometryPropertyTreeState contentsTreeState;
+    LayoutPoint paintOffsetFromContentsTreeState;
+    clipProperties->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState);
+    EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
+    EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
+    EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
 
     EXPECT_EQ(framePreTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(clipProperties->overflowClip(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->geometryPropertyTreeState.effect);
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
-TEST_P(PaintPropertyTreeBuilderTest, ContainsPaintContentsProperties)
+TEST_P(PaintPropertyTreeBuilderTest, ContainsPaintContentsTreeState)
 {
     setBodyInnerHTML(
-        "<style>body { margin: 0; }</style>"
-        "<div id='clipper' style='contain:paint; width:400px; height:300px;'>"
-        "  <div id='child' style='position:relative; width:500px; height: 600px;'></div>"
+        "<style>body { margin: 20px 30px; }</style>"
+        "<div id='clipper' style='contain:paint; width:300px; height:200px;'>"
+        "  <div id='child' style='position:relative; width:400px; height: 500px;'></div>"
         "</div>"
     );
 
     LayoutBoxModelObject* clipper = toLayoutBoxModelObject(document().getElementById("clipper")->layoutObject());
     const ObjectPaintProperties* clipProperties = clipper->objectPaintProperties();
     LayoutObject* child = document().getElementById("child")->layoutObject();
     const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
     // No scroll translation because the document does not scroll (not enough content).
     EXPECT_TRUE(!frameScrollTranslation());
     EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
-    GeometryPropertyTreeState contentsProperties;
-    clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(framePreTranslation(), contentsProperties.transform);
-    EXPECT_EQ(clipProperties->overflowClip(), contentsProperties.clip);
+    GeometryPropertyTreeState contentsTreeState;
+    LayoutPoint paintOffsetFromContentsTreeState;
+    clipProperties->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState);
+    EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
+    EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
+    EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
 
     EXPECT_EQ(framePreTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(clipProperties->overflowClip(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->geometryPropertyTreeState.effect);
-    CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
+    CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 500), child, clipper);
 }
 
-TEST_P(PaintPropertyTreeBuilderTest, OverflowScrollContentsProperties)
+TEST_P(PaintPropertyTreeBuilderTest, OverflowScrollContentsTreeState)
 {
     // This test verifies the tree builder correctly computes and records the property tree context
     // for a (pseudo) stacking context that is scrolled by a containing block that is not one of
     // the painting ancestors.
     setBodyInnerHTML(
-        "<style>body { margin: 0; }</style>"
+        "<style>body { margin: 20px 30px; }</style>"
         "<div id='clipper' style='overflow:scroll; width:400px; height:300px;'>"
         "  <div id='child' style='position:relative; width:500px; height: 600px;'></div>"
         "  <div style='width: 200px; height: 10000px'></div>"
         "</div>"
         "<div id='forceScroll' style='height: 4000px;'></div>"
     );
 
     Element* clipperElement = document().getElementById("clipper");
     clipperElement->scrollTo(1, 2);
 
     LayoutBoxModelObject* clipper = toLayoutBoxModelObject(clipperElement->layoutObject());
     const ObjectPaintProperties* clipProperties = clipper->objectPaintProperties();
     LayoutObject* child = document().getElementById("child")->layoutObject();
     const ObjectPaintProperties* childProperties = child->objectPaintProperties();
 
     EXPECT_EQ(frameScrollTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(frameContentClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
-    GeometryPropertyTreeState contentsProperties;
-    clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(clipProperties->scrollTranslation(), contentsProperties.transform);
-    EXPECT_EQ(clipProperties->overflowClip(), contentsProperties.clip);
+    GeometryPropertyTreeState contentsTreeState;
+    LayoutPoint paintOffsetFromContentsTreeState;
+    clipProperties->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState);
+    EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
+    EXPECT_EQ(clipProperties->scrollTranslation(), contentsTreeState.transform);
+    EXPECT_EQ(clipProperties->overflowClip(), contentsTreeState.clip);
 
     EXPECT_EQ(clipProperties->scrollTranslation(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     EXPECT_EQ(clipProperties->overflowClip(), childProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
     CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
 }
 
-TEST_P(PaintPropertyTreeBuilderTest, CssClipContentsProperties)
+TEST_P(PaintPropertyTreeBuilderTest, CssClipContentsTreeState)
 {
     // This test verifies the tree builder correctly computes and records the property tree context
     // for a (pseudo) stacking context that is scrolled by a containing block that is not one of
     // the painting ancestors.
     setBodyInnerHTML(
-        "<style>body { margin: 0; }</style>"
-        "<div id='clipper' style='position: absolute; clip: rect(10px, 80px, 70px, 40px); width:400px; height:300px;'>"
-        "  <div id='child' style='position:relative; width:500px; height: 600px;'></div>"
+        "<style>body { margin: 20px 30px; }</style>"
+        "<div id='clipper' style='position: absolute; clip: rect(10px, 80px, 70px, 40px); width:300px; height:200px;'>"
+        "  <div id='child' style='position:relative; width:400px; height: 500px;'></div>"
         "</div>"
     );
 
     LayoutBoxModelObject* clipper = toLayoutBoxModelObject(document().getElementById("clipper")->layoutObject());
     const ObjectPaintProperties* clipProperties = clipper->objectPaintProperties();
     LayoutObject* child = document().getElementById("child")->layoutObject();
 
     // No scroll translation because the document does not scroll (not enough content).
     EXPECT_TRUE(!frameScrollTranslation());
     EXPECT_EQ(framePreTranslation(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
     // CSS clip on an element causes it to clip itself, not just descendants.
     EXPECT_EQ(clipProperties->cssClip(), clipProperties->localBorderBoxProperties()->geometryPropertyTreeState.clip);
 
-    GeometryPropertyTreeState contentsProperties;
-    clipProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(framePreTranslation(), contentsProperties.transform);
-    EXPECT_EQ(clipProperties->cssClip(), contentsProperties.clip);
+    GeometryPropertyTreeState contentsTreeState;
+    LayoutPoint paintOffsetFromContentsTreeState;
+    clipProperties->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState);
+    EXPECT_EQ(LayoutPoint(30, 20), paintOffsetFromContentsTreeState);
+    EXPECT_EQ(framePreTranslation(), contentsTreeState.transform);
+    EXPECT_EQ(clipProperties->cssClip(), contentsTreeState.clip);
 
-    CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 500, 600), child, clipper);
+    CHECK_EXACT_VISUAL_RECT(LayoutRect(0, 0, 400, 500), child, clipper);
 }
 
-TEST_P(PaintPropertyTreeBuilderTest, SvgLocalToBorderBoxTransformContentsProperties)
+TEST_P(PaintPropertyTreeBuilderTest, SvgLocalToBorderBoxTransformContentsTreeState)
 {
     setBodyInnerHTML(
         "<style>"
         "  body {"
-        "    margin: 0px;"
+        "    margin: 20px 30px;"
         "  }"
         "  svg {"
         "    position: absolute;"
         "  }"
         "  rect {"
         "    transform: translate(100px, 100px);"
         "  }"
         "</style>"
         "<svg id='svgWithViewBox' width='100px' height='100px' viewBox='50 50 100 100'>"
         "  <rect id='rect' width='100px' height='100px' />"
         "</svg>");
 
     LayoutObject& svgWithViewBox = *document().getElementById("svgWithViewBox")->layoutObject();
     const ObjectPaintProperties* svgWithViewBoxProperties = svgWithViewBox.objectPaintProperties();
 
     EXPECT_EQ(framePreTranslation(), svgWithViewBoxProperties->localBorderBoxProperties()->geometryPropertyTreeState.transform);
 
-    GeometryPropertyTreeState contentsProperties;
-    svgWithViewBoxProperties->getContentsProperties(contentsProperties);
-    EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform(), contentsProperties.transform);
+    GeometryPropertyTreeState contentsTreeState;
+    LayoutPoint paintOffsetFromContentsTreeState;
+    svgWithViewBoxProperties->getContentsPropertyTreeState(contentsTreeState, paintOffsetFromContentsTreeState);
+    EXPECT_EQ(LayoutPoint(), paintOffsetFromContentsTreeState);
+    EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform(), contentsTreeState.transform);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, OverflowHiddenScrollProperties)
 {
     setBodyInnerHTML(
         "<style>"
         "  body {"
         "    margin: 0px;"
         "  }"
         "  #overflowHidden {"
@@ skipping 366 matching lines @@
 
     // Removing a main thread scrolling reason should update the entire tree.
     overflowB->removeAttribute("class");
     document().view()->updateAllLifecyclePhases();
     EXPECT_FALSE(overflowA->layoutObject()->objectPaintProperties()->scroll()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
     EXPECT_FALSE(overflowB->layoutObject()->objectPaintProperties()->scroll()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
     EXPECT_FALSE(overflowB->layoutObject()->objectPaintProperties()->scroll()->parent()->hasMainThreadScrollingReasons(MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects));
 }
 
 } // namespace blink