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

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

 // Copyright 2014 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 "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 12 matching lines @@
 using blink::testing::CreateOpacityOnlyEffect;
 using blink::testing::DefaultPaintChunkProperties;
 using testing::UnorderedElementsAre;
 
 namespace blink {
 
 class PaintControllerTestBase : public ::testing::Test {
  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_; }
 
   int NumCachedNewItems() const {
     return paint_controller_->num_cached_new_items_;
   }
 
 #ifndef NDEBUG
   int NumSequentialMatches() const {
     return paint_controller_->num_sequential_matches_;
@@ skipping 13 matching lines @@
 const DisplayItem::Type kBackgroundDrawingType =
     DisplayItem::kDrawingPaintPhaseFirst;
 const DisplayItem::Type kClipType = DisplayItem::kClipFirst;
 
 class TestDisplayItem final : public DisplayItem {
  public:
   TestDisplayItem(const FakeDisplayItemClient& client, Type type)
       : DisplayItem(client, type, sizeof(*this)) {}
 
   void Replay(GraphicsContext&) const final { NOTREACHED(); }
-  void AppendToWebDisplayItemList(const LayoutSize&,
+  void AppendToWebDisplayItemList(const IntRect&,
                                   WebDisplayItemList*) const final {
     NOTREACHED();
   }
 };
 
 #ifndef NDEBUG
 #define TRACE_DISPLAY_ITEMS(i, expected, actual)             \
   String trace = String::Format("%d: ", (int)i) +            \
                  "Expected: " + (expected).AsDebugString() + \
                  " Actual: " + (actual).AsDebugString();     \
@@ skipping 1797 matching lines @@
   GraphicsContext context(GetPaintController());
   DrawRect(context, client, kBackgroundDrawingType, FloatRect(0, 0, 100, 100));
 
   GetPaintController().CommitNewDisplayItems();
   const auto& paint_chunks = GetPaintController().PaintChunks();
   ASSERT_EQ(1u, paint_chunks.size());
   EXPECT_EQ(0u, paint_chunks[0].begin_index);
   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,
               unsigned count) {
   if (DrawingRecorder::UseCachedDrawingIfPossible(context, client, type))
     return;
 
   DrawingRecorder drawing_recorder(context, client, type,
                                    FloatRect(0, 0, 100, 100));
   SkPath path;
   path.moveTo(0, 0);
   path.lineTo(0, 100);
   path.lineTo(50, 50);
   path.lineTo(100, 100);
   path.lineTo(100, 0);
   path.close();
   PaintFlags flags;
   flags.setAntiAlias(true);
   for (unsigned i = 0; i < count; i++)
     context.DrawPath(path, flags);
 }
 
 TEST_F(PaintControllerTestBase, IsSuitableForGpuRasterizationSinglePath) {
   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());
 }
 
 TEST_F(PaintControllerTestBase,
        IsNotSuitableForGpuRasterizationSinglePaintRecordManyPaths) {
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
   GraphicsContext context(GetPaintController());
 
   DrawPath(context, client, kBackgroundDrawingType, 50);
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 }
 
 TEST_F(PaintControllerTestBase,
        IsNotSuitableForGpuRasterizationMultiplePaintRecordsSinglePathEach) {
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
   GraphicsContext context(GetPaintController());
   GetPaintController().BeginSkippingCache();
 
   for (int i = 0; i < 50; ++i)
     DrawPath(context, client, kBackgroundDrawingType, 50);
 
   GetPaintController().EndSkippingCache();
-  GetPaintController().CommitNewDisplayItems();
+  GetPaintController().CommitNewDisplayItems(LayoutSize());
   EXPECT_FALSE(
       GetPaintController().GetPaintArtifact().IsSuitableForGpuRasterization());
 }
 
 TEST_F(PaintControllerTestBase,
        IsNotSuitableForGpuRasterizationSinglePaintRecordManyPathsTwoPaints) {
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
 
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
   }
 
   client.SetDisplayItemsUncached();
 
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
   }
 }
 
 TEST_F(PaintControllerTestBase,
        IsNotSuitableForGpuRasterizationSinglePaintRecordManyPathsCached) {
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
 
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
   }
 
   {
     GraphicsContext context(GetPaintController());
     DrawPath(context, client, kBackgroundDrawingType, 50);
-    GetPaintController().CommitNewDisplayItems();
+    GetPaintController().CommitNewDisplayItems(LayoutSize());
     EXPECT_FALSE(GetPaintController()
                      .GetPaintArtifact()
                      .IsSuitableForGpuRasterization());
   }
 }
 
 TEST_F(
     PaintControllerTestBase,
     IsNotSuitableForGpuRasterizationSinglePaintRecordManyPathsCachedSubsequence) {
   FakeDisplayItemClient client("test client", LayoutRect(0, 0, 200, 100));
   FakeDisplayItemClient container("container", LayoutRect(0, 0, 200, 100));
 
   GraphicsContext context(GetPaintController());
   {
     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());
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
   DisplayItemClient::EndShouldKeepAliveAllClients();
 #endif
 }
 
 // Temporarily disabled (pref regressions due to GPU veto stickiness:
 // http://crbug.com/603969).
@@ skipping 10 matching lines @@
 
   // Run twice for empty/non-empty m_currentPaintArtifact coverage.
   for (int i = 0; i < 2; ++i) {
     for (int j = 0; j < 50; ++j)
       GetPaintController().CreateAndAppend<BeginClipPathDisplayItem>(client,
                                                                      path);
     DrawRect(context, client, kBackgroundDrawingType,
              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());
   }
 }
 
 TEST_F(PaintControllerTestBase, BeginAndEndFrame) {
   class FakeFrame {};
 
   // PaintController should have one null frame in the stack since beginning.
@@ skipping 298 matching lines @@
 TEST_F(PaintControllerUnderInvalidationTest, InvalidationInSubsequence) {
   // We allow invalidated display item clients as long as they would produce the
   // same display items. The cases of changed display items are tested by other
   // test cases.
   TestInvalidationInSubsequence();
 }
 
 #endif  // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 }  // namespace blink