Make DisplayItemClient an interface

third_party/WebKit/Source/core/frame/LocalFrame.h

Index: third_party/WebKit/Source/core/frame/LocalFrame.h
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h
index 32000d8e2ff04a14b82994d60274cc8274949460..3bb7e422a7706b7b9aec27e3bdeba0bb4fde6e67 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.h
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.h
@@ -76,7 +76,7 @@ class WebFrameHostScheduler;
 class WebFrameScheduler;
 template <typename Strategy> class PositionWithAffinityTemplate;
 
-class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame> {
+class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame>, public DisplayItemClient {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
 public:
     static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*, FrameOwner*);
@@ -179,8 +179,8 @@ public:
     void unregisterPluginElement(HTMLPlugInElement*);
     void clearWeakMembers(Visitor*);
 #endif
-    DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
-    String debugName() const { return "LocalFrame"; }
+
+    String debugName() const override { return "LocalFrame"; }

[pdr., 2015/12/05 21:39:19]

Should this be final?

[Xianzhu, 2015/12/07 17:14:00]

Yes. Done.

 
     bool shouldThrottleRendering() const;
 
@@ -203,7 +203,7 @@ private:
 
     // Paints the area for the given rect into a DragImage, with the given displayItemClient id attached.
     // The rect is in the coordinate space of the frame.
-    PassOwnPtr<DragImage> paintIntoDragImage(const DisplayItemClientWrapper&,
+    PassOwnPtr<DragImage> paintIntoDragImage(const DisplayItemClient&,
         RespectImageOrientationEnum shouldRespectImageOrientation, const GlobalPaintFlags,
         IntRect paintingRect, float opacity = 1);