Make DisplayItemClient an interface

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 58 matching lines @@
 class Range;
 class LayoutView;
 class TreeScope;
 class ScriptController;
 class SpellChecker;
 class TreeScope;
 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*);
 
     void init();
     void setView(PassRefPtrWillBeRawPtr<FrameView>);
     void createView(const IntSize&, const Color&, bool,
         ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
         ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
 
@@ skipping 82 matching lines @@
     // FIXME: once scroll customization is enabled everywhere
     // (crbug.com/416862), this should take a ScrollState object.
     ScrollResult applyScrollDelta(const FloatSize& delta, bool isScrollBegin);
     bool shouldScrollTopControls(const FloatSize& delta) const;
 
 #if ENABLE(OILPAN)
     void registerPluginElement(HTMLPlugInElement*);
     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;
 
     // Returns the frame scheduler, creating one if needed.
     WebFrameScheduler* frameScheduler();
 
     void updateSecurityOrigin(SecurityOrigin*);
 
     bool isNavigationAllowed() const { return m_navigationDisableCount == 0; }
 
 private:
     friend class FrameNavigationDisabler;
 
     LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
 
     // Internal Frame helper overrides:
     WindowProxyManager* windowProxyManager() const override;
 
     String localLayerTreeAsText(unsigned flags) const;
 
     // 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);
 
     void enableNavigation() { --m_navigationDisableCount; }
     void disableNavigation() { ++m_navigationDisableCount; }
 
     mutable FrameLoader m_loader;
     OwnPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
 
     RefPtrWillBeMember<FrameView> m_view;
@@ skipping 124 matching lines @@
     explicit FrameNavigationDisabler(LocalFrame&);
     ~FrameNavigationDisabler();
 
 private:
     RawPtrWillBeMember<LocalFrame> m_frame;
 };
 
 } // namespace blink
 
 #endif // LocalFrame_h