[SPInvalidation, SPv2] Compute paint offset for paginated content

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..f1752df34c0983b775e17d4dc76224d3641ba7cb 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp
@@ -2956,8 +2956,7 @@ TEST_P(PaintPropertyTreeBuilderTest, PaintOffsetsUnderMultiColumn) {
   // Above the spanner.
   // Column 1.
   EXPECT_EQ(LayoutPoint(), GetLayoutObjectByElementId("space1")->PaintOffset());
-  // Column 2. TODO(crbug.com/648274): This is incorrect. Should be (100, 0).
-  EXPECT_EQ(LayoutPoint(0, 30),
+  EXPECT_EQ(LayoutPoint(100, 0),
             GetLayoutObjectByElementId("space2")->PaintOffset());
 
   // The spanner's normal flow.
@@ -2967,11 +2966,9 @@ TEST_P(PaintPropertyTreeBuilderTest, PaintOffsetsUnderMultiColumn) {
             GetLayoutObjectByElementId("normal")->PaintOffset());
 
   // Below the spanner.
-  // Column 1. TODO(crbug.com/648274): This is incorrect. Should be (0, 80).
-  EXPECT_EQ(LayoutPoint(0, 60),
+  EXPECT_EQ(LayoutPoint(0, 80),
             GetLayoutObjectByElementId("space3")->PaintOffset());
-  // Column 2. TODO(crbug.com/648274): This is incorrect. Should be (100, 80).
-  EXPECT_EQ(LayoutPoint(0, 90),
+  EXPECT_EQ(LayoutPoint(100, 80),
             GetLayoutObjectByElementId("space4")->PaintOffset());
 
   // Out-of-flow positioned descendants of the spanner. They are laid out in
@@ -2982,8 +2979,7 @@ TEST_P(PaintPropertyTreeBuilderTest, PaintOffsetsUnderMultiColumn) {
             GetLayoutObjectByElementId("top-left")->PaintOffset());
 
   // "bottom-right" should be aligned to the bottom-right corner of space4.
-  // TODO(crbug.com/648274): This is incorrect. Should be (180, 90).
-  EXPECT_EQ(LayoutPoint(80, 100),
+  EXPECT_EQ(LayoutPoint(180, 90),
             GetLayoutObjectByElementId("bottom-right")->PaintOffset());
 }