Revert of Don't access DisplayItemClient::VisualRect() for cached display items.

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
index 1cff8d5208adb8a037e70deeba18147794d5e841..6711ad15da7a65211c99ff837d61a37b846114b0 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
@@ -30,6 +30,10 @@
  public:
   PaintControllerTestBase() : paint_controller_(PaintController::Create()) {}
 
+  IntRect VisualRect(const PaintArtifact& paint_artifact, size_t index) {
+    return paint_artifact.GetDisplayItemList().VisualRect(index);
+  }
+
  protected:
   PaintController& GetPaintController() { return *paint_controller_; }
 
@@ -63,7 +67,7 @@
       : DisplayItem(client, type, sizeof(*this)) {}
 
   void Replay(GraphicsContext&) const final { NOTREACHED(); }
-  void AppendToWebDisplayItemList(const LayoutSize&,
+  void AppendToWebDisplayItemList(const IntRect&,
                                   WebDisplayItemList*) const final {
     NOTREACHED();
   }
@@ -1881,6 +1885,18 @@
   EXPECT_EQ(1u, paint_chunks[0].end_index);
 }
 
+TEST_F(PaintControllerTestBase, PaintArtifactWithVisualRects) {
+  FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
+
+  GraphicsContext context(GetPaintController());
+  DrawRect(context, client, kBackgroundDrawingType, FloatRect(0, 0, 100, 100));
+
+  GetPaintController().CommitNewDisplayItems(LayoutSize(20, 30));
+  const auto& paint_artifact = GetPaintController().GetPaintArtifact();
+  ASSERT_EQ(1u, paint_artifact.GetDisplayItemList().size());
+  EXPECT_EQ(IntRect(-20, -30, 200, 100), VisualRect(paint_artifact, 0));
+}
+
 void DrawPath(GraphicsContext& context,
               DisplayItemClient& client,
               DisplayItem::Type type,
@@ -1907,7 +1923,7 @@
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
   GraphicsContext context(GetPaintController());
   DrawPath(context, client, kBackgroundDrawingType, 1);
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_TRUE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 }
@@ -1918,7 +1934,7 @@
   GraphicsContext context(GetPaintController());
 
   DrawPath(context, client, kBackgroundDrawingType, 50);
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 }
@@ -1933,7 +1949,7 @@
     DrawPath(context, client, kBackgroundDrawingType, 50);
 
   GetPaintController().EndSkippingCache();
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 }
@@ -1945,7 +1961,7 @@
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
@@ -1956,7 +1972,7 @@
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
@@ -1970,7 +1986,7 @@
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
@@ -1979,7 +1995,7 @@
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
@@ -1997,13 +2013,13 @@
     SubsequenceRecorder subsequence_recorder(context, container);
     DrawPath(context, client, kBackgroundDrawingType, 50);
   }
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 
   EXPECT_TRUE(
       SubsequenceRecorder::UseCachedSubsequenceIfPossible(context, container));
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 
@@ -2034,7 +2050,7 @@
              FloatRect(0, 0, 100, 100));
     for (int j = 0; j < 50; ++j)
       GetPaintController().CreateAndAppend<EndClipPathDisplayItem>(client);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());