Re-implement SVG transform paint property nodes [spv2]

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/LayoutView.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "platform/testing/UnitTestHelpers.h"
@@ skipping 399 matching lines @@
     EXPECT_EQ(TransformationMatrix().translate(70, 25), svgRootWith3dTransformProperties->paintOffsetTranslation()->matrix());
     EXPECT_EQ(document().view()->scrollTranslation(), svgRootWith3dTransformProperties->paintOffsetTranslation()->parent());
 
     LayoutObject& rectWith2dTransform = *document().getElementById("rectWith2dTransform")->layoutObject();
     ObjectPaintProperties* rectWith2dTransformProperties = rectWith2dTransform.objectPaintProperties();
     TransformationMatrix matrix;
     matrix.translate(100, 100);
     matrix.rotate(45);
     // SVG's transform origin is baked into the transform.
     matrix.applyTransformOrigin(50, 25, 0);
-    EXPECT_EQ(matrix, rectWith2dTransformProperties->svgLocalTransform()->matrix());
-    EXPECT_EQ(FloatPoint3D(0, 0, 0), rectWith2dTransformProperties->svgLocalTransform()->origin());
+    EXPECT_EQ(matrix, rectWith2dTransformProperties->transform()->matrix());
+    EXPECT_EQ(FloatPoint3D(0, 0, 0), rectWith2dTransformProperties->transform()->origin());
     // SVG does not use paint offset.
     EXPECT_EQ(nullptr, rectWith2dTransformProperties->paintOffsetTranslation());
 }
 
 TEST_F(PaintPropertyTreeBuilderTest, SVGViewBoxTransform)
 {
     setBodyInnerHTML(
         "<style>"
         "  body {"
         "    margin: 0px;"
         "  }"
         "  svg {"
         "    transform: translate3d(1px, 2px, 3px);"
         "    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();
     ObjectPaintProperties* svgWithViewBoxProperties = svgWithViewBox.objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3), svgWithViewBoxProperties->transform()->matrix());
-    EXPECT_EQ(TransformationMatrix().translate(-50, -50), svgWithViewBoxProperties->svgLocalTransform()->matrix());
-    EXPECT_EQ(svgWithViewBoxProperties->svgLocalTransform()->parent(), svgWithViewBoxProperties->transform());
+    EXPECT_EQ(TransformationMatrix().translate(-50, -50), svgWithViewBoxProperties->svgLocalToBorderBoxTransform()->matrix());
+    EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform()->parent(), svgWithViewBoxProperties->transform());
 
     LayoutObject& rect = *document().getElementById("rect")->layoutObject();
     ObjectPaintProperties* rectProperties = rect.objectPaintProperties();
-    EXPECT_EQ(TransformationMatrix().translate(100, 100), rectProperties->svgLocalTransform()->matrix());
-    EXPECT_EQ(svgWithViewBoxProperties->svgLocalTransform(), rectProperties->svgLocalTransform()->parent());
+    EXPECT_EQ(TransformationMatrix().translate(100, 100), rectProperties->transform()->matrix());
+    EXPECT_EQ(svgWithViewBoxProperties->svgLocalToBorderBoxTransform(), rectProperties->transform()->parent());
 }
 
 TEST_F(PaintPropertyTreeBuilderTest, SVGRootPaintOffsetTransformNode)
 {
     setBodyInnerHTML(
         "<style>body { margin: 0px; } </style>"
         "<svg id='svg' style='margin-left: 50px; margin-top: 25px; width: 100px; height: 100px;' />");
 
     LayoutObject& svg = *document().getElementById("svg")->layoutObject();
     ObjectPaintProperties* svgProperties = svg.objectPaintProperties();
-    // Ensure that a paint offset transform is emitted for SVG, even without a CSS transform.
-    EXPECT_EQ(nullptr, svgProperties->transform());
-    EXPECT_EQ(TransformationMatrix().translate(50, 25), svgProperties->paintOffsetTranslation()->matrix());
-    EXPECT_EQ(document().view()->scrollTranslation(), svgProperties->paintOffsetTranslation()->parent());
+    // Ensure that a paint offset transform is not unnecessarily emitted.
+    EXPECT_EQ(nullptr, svgProperties->paintOffsetTranslation());
+    EXPECT_EQ(TransformationMatrix().translate(50, 25), svgProperties->svgLocalToBorderBoxTransform()->matrix());
+    EXPECT_EQ(document().view()->scrollTranslation(), svgProperties->svgLocalToBorderBoxTransform()->parent());
+}
+
+TEST_F(PaintPropertyTreeBuilderTest, SVGRootLocalToBorderBoxTransformNode)
+{
+    setBodyInnerHTML(
+        "<style>body { margin: 0px; } </style>"
+        "<svg id='svg' style='transform: translate(2px, 3px); margin: 5px; border: 7px solid green; width: 100px; height: 100px;'/>");
+
+    LayoutObject& svg = *document().getElementById("svg")->layoutObject();
+    ObjectPaintProperties* svgProperties = svg.objectPaintProperties();
+    EXPECT_EQ(TransformationMatrix().translate(5, 5), svgProperties->paintOffsetTranslation()->matrix());
+    EXPECT_EQ(TransformationMatrix().translate(2, 3), svgProperties->transform()->matrix());
+    EXPECT_EQ(TransformationMatrix().translate(7, 7), svgProperties->svgLocalToBorderBoxTransform()->matrix());
+
+    EXPECT_EQ(svgProperties->paintOffsetTranslation(), svgProperties->transform()->parent());
+    EXPECT_EQ(svgProperties->transform(), svgProperties->svgLocalToBorderBoxTransform()->parent());
 }
 
 TEST_F(PaintPropertyTreeBuilderTest, TransformNodesAcrossSVGHTMLBoundary)
 {
     setBodyInnerHTML(
         "<style> body { margin: 0px; } </style>"
         "<svg id='svgWithTransform' style='transform: translate3d(1px, 2px, 3px);'>"
         "  <foreignObject>"
         "    <body>"
         "      <div id='divWithTransform' style='transform: translate3d(3px, 4px, 5px);'></div>"
@@ skipping 25 matching lines @@
         "    </foreignObject>"
         "  </g>"
         "</svg>");
 
     LayoutObject& svg = *document().getElementById("svg")->layoutObject();
     ObjectPaintProperties* svgProperties = svg.objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate3d(1, 2, 3), svgProperties->transform()->matrix());
 
     LayoutObject& container = *document().getElementById("container")->layoutObject();
     ObjectPaintProperties* containerProperties = container.objectPaintProperties();
-    EXPECT_EQ(TransformationMatrix().translate(20, 30), containerProperties->svgLocalTransform()->matrix());
-    EXPECT_EQ(svgProperties->transform(), containerProperties->svgLocalTransform()->parent());
+    EXPECT_EQ(TransformationMatrix().translate(20, 30), containerProperties->transform()->matrix());
+    EXPECT_EQ(svgProperties->transform(), containerProperties->transform()->parent());
 
     Element* fixed = document().getElementById("fixed");
     ObjectPaintProperties* fixedProperties = fixed->layoutObject()->objectPaintProperties();
     EXPECT_EQ(TransformationMatrix().translate(200, 150), fixedProperties->paintOffsetTranslation()->matrix());
     // Ensure the fixed position element is rooted at the nearest transform container.
-    EXPECT_EQ(containerProperties->svgLocalTransform(), fixedProperties->paintOffsetTranslation()->parent());
+    EXPECT_EQ(containerProperties->transform(), fixedProperties->paintOffsetTranslation()->parent());
 }
 
 TEST_F(PaintPropertyTreeBuilderTest, ControlClip)
 {
     setBodyInnerHTML(
         "<style>"
         "  body {"
         "    margin: 0;"
         "  }"
         "  input {"
@@ skipping 327 matching lines @@
         "    <div id='spanner' style='column-span: all; opacity: 0.5; width: 100px; height: 100px;'></div>"
         "  </div>"
         "</div>"
     );
 
     LayoutObject& spanner = *getLayoutObjectByElementId("spanner");
     EXPECT_EQ(LayoutPoint(55, 44), spanner.objectPaintProperties()->localBorderBoxProperties()->paintOffset);
 }
 
 } // namespace blink