Revert of Avoid special handling of LayoutSVGForeignObject about its paint offset

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 1660 matching lines @@
 
   // Ensure there is no PaintOffset transform between the rect and the svg's
   // transform.
   EXPECT_EQ(svgWithTransformProperties->transform(),
             rectWithTransformProperties->transform()->parent());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, SvgRootAndForeignObjectPixelSnapping) {
   setBodyInnerHTML(
       "<svg id=svg style='position: relative; left: 0.6px; top: 0.3px'>"
-      "  <foreignObject id=foreign x='3.6' y='5.2'"
-      "      transform='translate(1.5, 1.5) scale(2)'>"
+      "  <foreignObject id=foreign x='3.5' y='5.4' transform='translate(1,1)'>"
       "    <div id=div style='position: absolute; left: 5.6px; top: 7.3px'>"
       "    </div>"
       "  </foreignObject>"
       "</svg>");
 
   const auto* svgProperties =
       getLayoutObjectByElementId("svg")->paintProperties();
   EXPECT_EQ(nullptr, svgProperties->paintOffsetTranslation());
   EXPECT_EQ(LayoutPoint(LayoutUnit(8.6), LayoutUnit(8.3)),
             svgProperties->localBorderBoxProperties()->paintOffset);
   // Paint offset of SVGRoot is baked into svgLocalToBorderBoxTransform after
   // snapped to pixels.
   EXPECT_EQ(TransformationMatrix().translate(9, 8),
             svgProperties->svgLocalToBorderBoxTransform()->matrix());
 
-  const auto* foreignObject =
-      toLayoutBox(getLayoutObjectByElementId("foreign"));
-  const auto* foreignObjectProperties = foreignObject->paintProperties();
-  // The offset of foreign object should be snapped to pixels before applying
-  // the local transforms.
-  EXPECT_EQ(TransformationMatrix().translate(1.5, 1.5).scale(2).translate(4, 5),
-            foreignObjectProperties->transform()->matrix());
-  EXPECT_EQ(LayoutPoint(4, 5), foreignObject->location());
+  const auto* foreignObjectProperties =
+      getLayoutObjectByElementId("foreign")->paintProperties();
   EXPECT_EQ(nullptr, foreignObjectProperties->paintOffsetTranslation());
-  EXPECT_EQ(LayoutPoint(),
+  // Paint offset of foreignObject should be originated from SVG root and
+  // snapped to pixels.
+  EXPECT_EQ(LayoutPoint(4, 5),
             foreignObjectProperties->localBorderBoxProperties()->paintOffset);
 
   const auto* divProperties =
       getLayoutObjectByElementId("div")->paintProperties();
-  // Paint offsets of contents of the foreign object originate from (0, 0).
-  EXPECT_EQ(LayoutPoint(LayoutUnit(5.6), LayoutUnit(7.3)),
+  // Paint offset of descendant of foreignObject accumulates on paint offset of
+  // foreignObject.
+  EXPECT_EQ(LayoutPoint(LayoutUnit(4 + 5.6), LayoutUnit(5 + 7.3)),
             divProperties->localBorderBoxProperties()->paintOffset);
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, NoRenderingContextByDefault) {
   setBodyInnerHTML("<div style='transform: translateZ(0)'></div>");
 
   const ObjectPaintProperties* properties =
       document().body()->firstChild()->layoutObject()->paintProperties();
   ASSERT_TRUE(properties->transform());
   EXPECT_FALSE(properties->transform()->hasRenderingContext());
@@ skipping 1163 matching lines @@
   EXPECT_EQ(framePreTranslation(),
             childProperties->paintOffsetTranslation()->parent());
   EXPECT_EQ(childProperties->paintOffsetTranslation(),
             childPaintState.transform());
   // This will change once we added clip expansion node.
   EXPECT_EQ(filterProperties->effect()->outputClip(), childPaintState.clip());
   EXPECT_EQ(filterProperties->effect(), childPaintState.effect());
 }
 
 }  // namespace blink