Upstream version 9.38.198.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 b9048ba..49896f4 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp
+++ b/src/third_party/WebKit/Source/web/WebPopupMenuImpl.cpp
@@ -57,8 +57,6 @@
 #include "web/WebInputEventConversion.h"
 #include <skia/ext/platform_canvas.h>
 
-using namespace WebCore;
-
 namespace blink {
 
 // WebPopupMenu ---------------------------------------------------------------
@@ -121,7 +119,7 @@ void WebPopupMenuImpl::handleMouseMove(const WebMouseEvent& event)
 
         // We cannot call setToolTipText() in PopupContainer, because PopupContainer is in WebCore, and we cannot refer to WebKit from Webcore.
         PopupContainer* container = static_cast<PopupContainer*>(m_widget);
-        client()->setToolTipText(container->getSelectedItemToolTip(), container->menuStyle().textDirection() == WebCore::RTL ? WebTextDirectionRightToLeft : WebTextDirectionLeftToRight);
+        client()->setToolTipText(container->getSelectedItemToolTip(), toWebTextDirection(container->menuStyle().textDirection()));
     }
 }
 
@@ -204,7 +202,7 @@ void WebPopupMenuImpl::willEndLiveResize()
 {
 }
 
-void WebPopupMenuImpl::animate(double)
+void WebPopupMenuImpl::beginFrame(const WebBeginFrameArgs&)
 {
 }
 
@@ -252,23 +250,23 @@ bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent)
     // whether keyboard events are processed).
     switch (inputEvent.type) {
     case WebInputEvent::MouseMove:
-        handleMouseMove(*static_cast<const WebMouseEvent*>(&inputEvent));
+        handleMouseMove(static_cast<const WebMouseEvent&>(inputEvent));
         return true;
 
     case WebInputEvent::MouseLeave:
-        handleMouseLeave(*static_cast<const WebMouseEvent*>(&inputEvent));
+        handleMouseLeave(static_cast<const WebMouseEvent&>(inputEvent));
         return true;
 
     case WebInputEvent::MouseWheel:
-        handleMouseWheel(*static_cast<const WebMouseWheelEvent*>(&inputEvent));
+        handleMouseWheel(static_cast<const WebMouseWheelEvent&>(inputEvent));
         return true;
 
     case WebInputEvent::MouseDown:
-        handleMouseDown(*static_cast<const WebMouseEvent*>(&inputEvent));
+        handleMouseDown(static_cast<const WebMouseEvent&>(inputEvent));
         return true;
 
     case WebInputEvent::MouseUp:
-        handleMouseUp(*static_cast<const WebMouseEvent*>(&inputEvent));
+        handleMouseUp(static_cast<const WebMouseEvent&>(inputEvent));
         return true;
 
     // In Windows, RawKeyDown only has information about the physical key, but
@@ -283,13 +281,13 @@ bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent)
     case WebInputEvent::KeyDown:
     case WebInputEvent::KeyUp:
     case WebInputEvent::Char:
-        return handleKeyEvent(*static_cast<const WebKeyboardEvent*>(&inputEvent));
+        return handleKeyEvent(static_cast<const WebKeyboardEvent&>(inputEvent));
 
     case WebInputEvent::TouchStart:
     case WebInputEvent::TouchMove:
     case WebInputEvent::TouchEnd:
     case WebInputEvent::TouchCancel:
-        return handleTouchEvent(*static_cast<const WebTouchEvent*>(&inputEvent));
+        return handleTouchEvent(static_cast<const WebTouchEvent&>(inputEvent));
 
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
@@ -309,7 +307,7 @@ bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent)
     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate:
-        return handleGestureEvent(*static_cast<const WebGestureEvent*>(&inputEvent));
+        return handleGestureEvent(static_cast<const WebGestureEvent&>(inputEvent));
 
     case WebInputEvent::Undefined:
     case WebInputEvent::MouseEnter:
@@ -367,7 +365,7 @@ void WebPopupMenuImpl::setTextDirection(WebTextDirection)
 
 
 //-----------------------------------------------------------------------------
-// WebCore::HostWindow
+// HostWindow
 
 void WebPopupMenuImpl::invalidateContentsAndRootView(const IntRect& paintRect)
 {
@@ -388,15 +386,10 @@ void WebPopupMenuImpl::scheduleAnimation()
 {
 }
 
-void WebPopupMenuImpl::scroll(const IntSize& scrollDelta, const IntRect& scrollRect, const IntRect& clipRect)
+void WebPopupMenuImpl::scroll()
 {
-    if (m_client) {
-        int dx = scrollDelta.width();
-        int dy = scrollDelta.height();
-        m_client->didScrollRect(dx, dy, clipRect);
-    }
     if (m_rootLayer)
-        m_rootLayer->layer()->invalidateRect(FloatRect(clipRect));
+        m_rootLayer->layer()->invalidate();
 }
 
 IntRect WebPopupMenuImpl::rootViewToScreen(const IntRect& rect) const
@@ -411,7 +404,7 @@ WebScreenInfo WebPopupMenuImpl::screenInfo() const
 }
 
 //-----------------------------------------------------------------------------
-// WebCore::FramelessScrollViewClient
+// FramelessScrollViewClient
 
 void WebPopupMenuImpl::popupClosed(FramelessScrollView* widget)
 {