Shift flowthread-to-visual coordinate space conversion one level up in the tree.

third_party/WebKit/Source/core/layout/MapCoordinatesTest.cpp

 // Copyright 2016 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/LayoutInline.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "platform/geometry/TransformState.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 472 matching lines @@
         "    text"
         "</div>");
 
     LayoutObject* target = getLayoutObjectByElementId("sibling")->nextSibling();
     ASSERT_TRUE(target->isText());
     LayoutBox* flowThread = toLayoutBox(target->parent());
     ASSERT_TRUE(flowThread->isLayoutFlowThread());
     LayoutBox* multicol = toLayoutBox(getLayoutObjectByElementId("multicol"));
 
     FloatPoint mappedPoint = mapLocalToAncestor(target, flowThread, FloatPoint(10, 70));
-    EXPECT_EQ(FloatPoint(220, 20), mappedPoint);
+    EXPECT_EQ(FloatPoint(10, 70), mappedPoint);
 
     mappedPoint = mapLocalToAncestor(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(225, 25), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(220, 20), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(target, flowThread, mappedPoint);
     EXPECT_EQ(FloatPoint(10, 70), mappedPoint);
 }
 
 TEST_F(MapCoordinatesTest, MulticolWithInline)
 {
     setBodyInnerHTML(
         "<div id='multicol' style='-webkit-columns:2; -webkit-column-gap:20px; width:400px; line-height:50px; padding:5px;'>"
         "    <span id='target'><br>text</span>"
         "</div>");
 
     LayoutObject* target = getLayoutObjectByElementId("target");
     LayoutBox* flowThread = toLayoutBox(target->parent());
     ASSERT_TRUE(flowThread->isLayoutFlowThread());
     LayoutBox* multicol = toLayoutBox(getLayoutObjectByElementId("multicol"));
 
     FloatPoint mappedPoint = mapLocalToAncestor(target, flowThread, FloatPoint(10, 70));
-    EXPECT_EQ(FloatPoint(220, 20), mappedPoint);
+    EXPECT_EQ(FloatPoint(10, 70), mappedPoint);
 
     mappedPoint = mapLocalToAncestor(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(225, 25), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(220, 20), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(target, flowThread, mappedPoint);
     EXPECT_EQ(FloatPoint(10, 70), mappedPoint);
 }
@@ skipping 12 matching lines @@
     FloatPoint mappedPoint = mapLocalToAncestor(target, container, FloatPoint());
     EXPECT_EQ(FloatPoint(125, 35), mappedPoint);
     mappedPoint = mapAncestorToLocal(target, container, mappedPoint);
     EXPECT_EQ(FloatPoint(), mappedPoint);
 
     // Walk each ancestor in the chain separately, to verify each step on the way.
     LayoutBox* flowThread = target->parentBox();
     ASSERT_TRUE(flowThread->isLayoutFlowThread());
 
     mappedPoint = mapLocalToAncestor(target, flowThread, FloatPoint());
-    EXPECT_EQ(FloatPoint(110, 20), mappedPoint);
+    EXPECT_EQ(FloatPoint(10, 120), mappedPoint);
 
     mappedPoint = mapLocalToAncestor(flowThread, container, mappedPoint);
     EXPECT_EQ(FloatPoint(125, 35), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(flowThread, container, mappedPoint);
     EXPECT_EQ(FloatPoint(110, 20), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(target, flowThread, mappedPoint);
     EXPECT_EQ(FloatPoint(), mappedPoint);
 }
@@ skipping 18 matching lines @@
 
     // Walk each ancestor in the chain separately, to verify each step on the way.
     LayoutBox* relpos = toLayoutBox(getLayoutObjectByElementId("relpos"));
     LayoutBox* flowThread = relpos->parentBox();
     ASSERT_TRUE(flowThread->isLayoutFlowThread());
 
     mappedPoint = mapLocalToAncestor(target, relpos, FloatPoint());
     EXPECT_EQ(FloatPoint(25, 25), mappedPoint);
 
     mappedPoint = mapLocalToAncestor(relpos, flowThread, mappedPoint);
-    EXPECT_EQ(FloatPoint(129, 39), mappedPoint);
+    EXPECT_EQ(FloatPoint(29, 139), mappedPoint);
 
     mappedPoint = mapLocalToAncestor(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(144, 54), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(flowThread, multicol, mappedPoint);
     EXPECT_EQ(FloatPoint(129, 39), mappedPoint);
 
     mappedPoint = mapAncestorToLocal(relpos, flowThread, mappedPoint);
     EXPECT_EQ(FloatPoint(25, 25), mappedPoint);
 
@@ skipping 530 matching lines @@
 
     // With child2, each rotation gets flattened and the end result is approximately a 90-degree rotation.
     matrix = child2->localToAbsoluteTransform();
     EXPECT_NEAR(50.0, matrix.projectPoint(FloatPoint(100.0, 50.0)).x(), LayoutUnit::epsilon());
     EXPECT_NEAR(50.0, matrix.projectPoint(FloatPoint(100.0, 50.0)).y(), LayoutUnit::epsilon());
     EXPECT_NEAR(25.0, matrix.projectPoint(FloatPoint(50.0, 100.0)).x(), LayoutUnit::epsilon());
     EXPECT_NEAR(100.0, matrix.projectPoint(FloatPoint(50.0, 100.0)).y(), LayoutUnit::epsilon());
 }
 
 } // namespace blink