Remove FramelessScrollView.

Source/web/WebPopupMenuImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebPopupMenuImpl_h
 #define WebPopupMenuImpl_h
 
-#include "platform/scroll/FramelessScrollViewClient.h"
 #include "public/platform/WebContentLayerClient.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebSize.h"
 #include "public/web/WebPopupMenu.h"
+#include "web/PopupContainerClient.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 class LocalFrame;
-class FramelessScrollView;
 class KeyboardEvent;
 class Page;
 class PlatformKeyboardEvent;
 class Range;
 class WebContentLayer;
 class WebGestureEvent;
 class WebKeyboardEvent;
 class WebLayerTreeView;
 class WebMouseEvent;
 class WebMouseWheelEvent;
 class WebRange;
 class WebTouchEvent;
 class Widget;
 struct WebRect;
 
-class WebPopupMenuImpl : public WebPopupMenu, public FramelessScrollViewClient, public WebContentLayerClient, public RefCounted<WebPopupMenuImpl> {
+class WebPopupMenuImpl : public WebPopupMenu, public PopupContainerClient, public WebContentLayerClient, public RefCounted<WebPopupMenuImpl> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     // WebWidget functions:
     virtual void close() OVERRIDE FINAL;
     virtual WebSize size() OVERRIDE FINAL { return m_size; }
     virtual void willStartLiveResize() OVERRIDE FINAL;
     virtual void resize(const WebSize&) OVERRIDE FINAL;
     virtual void willEndLiveResize() OVERRIDE FINAL;
     virtual void beginFrame(const WebBeginFrameArgs&) OVERRIDE FINAL;
     virtual void layout() OVERRIDE FINAL;
@@ skipping 14 matching lines @@
     virtual void setTextDirection(WebTextDirection) OVERRIDE FINAL;
     virtual bool isAcceleratedCompositingActive() const OVERRIDE FINAL { return false; }
     virtual bool isPopupMenu() const OVERRIDE FINAL { return true; }
     virtual void willCloseLayerTreeView() OVERRIDE FINAL;
 
     // WebContentLayerClient
     virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, WebFloatRect& opaque,
         WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE FINAL;
 
     // WebPopupMenuImpl
-    void initialize(FramelessScrollView* widget, const WebRect& bounds);
+    void initialize(PopupContainer* widget, const WebRect& bounds);
 
     WebWidgetClient* client() { return m_client; }
 
     void handleMouseMove(const WebMouseEvent&);
     void handleMouseLeave(const WebMouseEvent&);
     void handleMouseDown(const WebMouseEvent&);
     void handleMouseUp(const WebMouseEvent&);
     void handleMouseDoubleClick(const WebMouseEvent&);
     void handleMouseWheel(const WebMouseWheelEvent&);
     bool handleGestureEvent(const WebGestureEvent&);
     bool handleTouchEvent(const WebTouchEvent&);
     bool handleKeyEvent(const WebKeyboardEvent&);
 
    protected:
     friend class WebPopupMenu; // For WebPopupMenu::create.
     friend class WTF::RefCounted<WebPopupMenuImpl>;
 
     explicit WebPopupMenuImpl(WebWidgetClient*);
     ~WebPopupMenuImpl();
 
     // HostWindow methods:
     virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE FINAL;
     virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE FINAL;
     virtual void scheduleAnimation() OVERRIDE FINAL;
     virtual IntRect rootViewToScreen(const IntRect&) const OVERRIDE FINAL;
     virtual WebScreenInfo screenInfo() const OVERRIDE FINAL;
 
-    // FramelessScrollViewClient methods:
-    virtual void popupClosed(FramelessScrollView*) OVERRIDE FINAL;
+    // PopupContainerClient methods:
+    virtual void popupClosed(PopupContainer*) OVERRIDE FINAL;
 
     WebWidgetClient* m_client;
     WebSize m_size;
 
     WebLayerTreeView* m_layerTreeView;
     OwnPtr<WebContentLayer> m_rootLayer;
 
     WebPoint m_lastMousePosition;
 
     // This is a non-owning ref. The popup will notify us via popupClosed()
     // before it is destroyed.
-    FramelessScrollView* m_widget;
+    PopupContainer* m_widget;
 };
 
 DEFINE_TYPE_CASTS(WebPopupMenuImpl, WebWidget, widget, widget->isPopupMenu(), widget.isPopupMenu());
-// WebPopupMenuImpl is the only implementation of FramelessScrollViewClient, so
+// WebPopupMenuImpl is the only implementation of PopupContainerClient, so
 // no need for further checking.
-DEFINE_TYPE_CASTS(WebPopupMenuImpl, FramelessScrollViewClient, client, true, true);
+DEFINE_TYPE_CASTS(WebPopupMenuImpl, PopupContainerClient, client, true, true);
 
 } // namespace blink
 
 #endif