Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp b/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp
index 49896f4..75860dd 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp
+++ b/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp
@@ -41,7 +41,6 @@
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/skia/SkiaUtils.h"
-#include "platform/scroll/FramelessScrollView.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebContentLayer.h"
@@ -89,7 +88,7 @@ void WebPopupMenuImpl::willCloseLayerTreeView()
     m_layerTreeView = 0;
 }
 
-void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bounds)
+void WebPopupMenuImpl::initialize(PopupContainer* widget, const WebRect& bounds)
 {
     m_widget = widget;
     m_widget->setClient(this);
@@ -210,8 +209,7 @@ void WebPopupMenuImpl::layout()
 {
 }
 
-void WebPopupMenuImpl::paintContents(WebCanvas* canvas, const WebRect& rect, bool, WebFloatRect&,
-    WebContentLayerClient::GraphicsContextStatus contextStatus)
+void WebPopupMenuImpl::paintContents(WebCanvas* canvas, const WebRect& rect, bool, WebContentLayerClient::GraphicsContextStatus contextStatus)
 {
     if (!m_widget)
         return;
@@ -386,12 +384,6 @@ void WebPopupMenuImpl::scheduleAnimation()
 {
 }
 
-void WebPopupMenuImpl::scroll()
-{
-    if (m_rootLayer)
-        m_rootLayer->layer()->invalidate();
-}
-
 IntRect WebPopupMenuImpl::rootViewToScreen(const IntRect& rect) const
 {
     notImplemented();
@@ -403,10 +395,7 @@ WebScreenInfo WebPopupMenuImpl::screenInfo() const
     return WebScreenInfo();
 }
 
-//-----------------------------------------------------------------------------
-// FramelessScrollViewClient
-
-void WebPopupMenuImpl::popupClosed(FramelessScrollView* widget)
+void WebPopupMenuImpl::popupClosed(PopupContainer* widget)
 {
     ASSERT(widget == m_widget);
     if (m_widget) {