Make DisplayItemClient an interface

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 "config.h"
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CachedDisplayItem.h"
@@ skipping 25 matching lines @@
 
     OwnPtr<PaintController> m_paintController;
     bool m_originalSlimmingPaintSynchronizedPaintingEnabled;
     bool m_originalSlimmingPaintV2Enabled;
 };
 
 const DisplayItem::Type foregroundDrawingType = static_cast<DisplayItem::Type>(DisplayItem::DrawingPaintPhaseFirst + 4);
 const DisplayItem::Type backgroundDrawingType = DisplayItem::DrawingPaintPhaseFirst;
 const DisplayItem::Type clipType = DisplayItem::ClipFirst;
 
-class TestDisplayItemClient {
+class TestDisplayItemClient : public DisplayItemClient {
 public:
     TestDisplayItemClient(const String& name)
         : m_name(name)
     { }
 
-    DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
-    String debugName() const { return m_name; }
+    String debugName() const final { return m_name; }
 
 private:
     String m_name;
 };
 
 class TestDisplayItem final : public DisplayItem {
 public:
     TestDisplayItem(const TestDisplayItemClient& client, Type type) : DisplayItem(client, type, sizeof(*this)) { }
 
     void replay(GraphicsContext&) const final { ASSERT_NOT_REACHED(); }
@@ skipping 299 matching lines @@
     TestDisplayItemClient second("second");
     GraphicsContext context(paintController());
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
-    EXPECT_TRUE(paintController().clientCacheIsValid(first.displayItemClient()));
-    EXPECT_TRUE(paintController().clientCacheIsValid(second.displayItemClient()));
+    EXPECT_TRUE(paintController().clientCacheIsValid(first));
+    EXPECT_TRUE(paintController().clientCacheIsValid(second));
     const SkPicture* firstPicture = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[0]).picture();
     const SkPicture* secondPicture = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[1]).picture();
 
     paintController().invalidate(first, PaintInvalidationFull, nullptr);
-    EXPECT_FALSE(paintController().clientCacheIsValid(first.displayItemClient()));
-    EXPECT_TRUE(paintController().clientCacheIsValid(second.displayItemClient()));
+    EXPECT_FALSE(paintController().clientCacheIsValid(first));
+    EXPECT_TRUE(paintController().clientCacheIsValid(second));
 
     drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));
     paintController().commitNewDisplayItems();
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 2,
         TestDisplayItem(first, backgroundDrawingType),
         TestDisplayItem(second, backgroundDrawingType));
     // The first display item should be updated.
     EXPECT_NE(firstPicture, static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[0]).picture());
     // The second display item should be cached.
     EXPECT_EQ(secondPicture, static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[1]).picture());
-    EXPECT_TRUE(paintController().clientCacheIsValid(first.displayItemClient()));
-    EXPECT_TRUE(paintController().clientCacheIsValid(second.displayItemClient()));
+    EXPECT_TRUE(paintController().clientCacheIsValid(first));
+    EXPECT_TRUE(paintController().clientCacheIsValid(second));
 
     paintController().invalidateAll();
-    EXPECT_FALSE(paintController().clientCacheIsValid(first.displayItemClient()));
-    EXPECT_FALSE(paintController().clientCacheIsValid(second.displayItemClient()));
+    EXPECT_FALSE(paintController().clientCacheIsValid(first));
+    EXPECT_FALSE(paintController().clientCacheIsValid(second));
 }
 
 TEST_F(PaintControllerTest, ComplexUpdateSwapOrder)
 {
     TestDisplayItemClient container1("container1");
     TestDisplayItemClient content1("content1");
     TestDisplayItemClient container2("container2");
     TestDisplayItemClient content2("content2");
     GraphicsContext context(paintController());
 
@@ skipping 250 matching lines @@
 
     EXPECT_DISPLAY_LIST(paintController().displayItemList(), 3,
         TestDisplayItem(multicol, backgroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType),
         TestDisplayItem(content, foregroundDrawingType));
     RefPtr<const SkPicture> picture1 = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[1]).picture();
     RefPtr<const SkPicture> picture2 = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[2]).picture();
     EXPECT_NE(picture1, picture2);
 
     // Draw again with nothing invalidated.
-    EXPECT_TRUE(paintController().clientCacheIsValid(multicol.displayItemClient()));
+    EXPECT_TRUE(paintController().clientCacheIsValid(multicol));
     drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 200, 100, 100));
     paintController().beginScope();
     drawRect(context, content, foregroundDrawingType, rect1);
     paintController().endScope();
 
     paintController().beginScope();
     drawRect(context, content, foregroundDrawingType, rect2);
     paintController().endScope();
 
     EXPECT_DISPLAY_LIST(paintController().newDisplayItemList(), 3,
@@ skipping 101 matching lines @@
     drawRect(context, client, backgroundDrawingType, FloatRect(0, 0, 100, 100));
 
     paintController().commitNewDisplayItems();
     const auto& paintChunks = paintController().paintChunks();
     ASSERT_EQ(1u, paintChunks.size());
     EXPECT_EQ(0u, paintChunks[0].beginIndex);
     EXPECT_EQ(1u, paintChunks[0].endIndex);
 }
 
 } // namespace blink