Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebPopupMenuImpl.h

diff --git a/src/third_party/WebKit/Source/web/WebPopupMenuImpl.h b/src/third_party/WebKit/Source/web/WebPopupMenuImpl.h
index 758cd35..6dbcfce 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebPopupMenuImpl.h
+++ b/src/third_party/WebKit/Source/web/WebPopupMenuImpl.h
@@ -31,17 +31,16 @@
 #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;
@@ -57,7 +56,7 @@ 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:
@@ -88,11 +87,10 @@ public:
     virtual void willCloseLayerTreeView() OVERRIDE FINAL;
 
     // WebContentLayerClient
-    virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, WebFloatRect& opaque,
-        WebContentLayerClient::GraphicsContextStatus = GraphicsContextEnabled) OVERRIDE FINAL;
+    virtual void paintContents(WebCanvas*, const WebRect& clip, bool canPaintLCDTest, 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; }
 
@@ -117,12 +115,11 @@ public:
     virtual void invalidateContentsAndRootView(const IntRect&) OVERRIDE FINAL;
     virtual void invalidateContentsForSlowScroll(const IntRect&) OVERRIDE FINAL;
     virtual void scheduleAnimation() OVERRIDE FINAL;
-    virtual void scroll() 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;
@@ -134,13 +131,13 @@ public:
 
     // 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