Move GestureEvent to NewEventDispatcher

sky/engine/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 46 matching lines @@
 #include "sky/engine/core/page/Chrome.h"
 #include "sky/engine/core/page/EventHandler.h"
 #include "sky/engine/core/page/EventWithHitTestResults.h"
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/platform/Cursor.h"
 #include "sky/engine/platform/KeyboardCodes.h"
 #include "sky/engine/platform/Logging.h"
 #include "sky/engine/platform/NotImplemented.h"
-#include "sky/engine/platform/PlatformGestureEvent.h"
 #include "sky/engine/platform/PlatformKeyboardEvent.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/fonts/FontCache.h"
 #include "sky/engine/platform/graphics/Color.h"
 #include "sky/engine/platform/graphics/GraphicsContext.h"
 #include "sky/engine/platform/graphics/Image.h"
 #include "sky/engine/platform/graphics/ImageBuffer.h"
 #include "sky/engine/platform/scroll/Scrollbar.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/public/platform/WebFloatPoint.h"
@@ skipping 84 matching lines @@
 WebViewImpl::~WebViewImpl()
 {
     ASSERT(!m_page);
 }
 
 WebLocalFrameImpl* WebViewImpl::mainFrameImpl()
 {
     return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0;
 }
 
-bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
-{
-    bool eventSwallowed = false;
-    bool eventCancelled = false; // for disambiguation
-
-    PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
-
-    // FIXME: Remove redundant hit tests by pushing the call to EventHandler::targetGestureEvent
-    // up to this point and pass GestureEventWithHitTestResults around.
-
-    switch (event.type) {
-    case WebInputEvent::GestureTap: {
-        eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(platformEvent);
-        break;
-    }
-    case WebInputEvent::GestureTwoFingerTap:
-    case WebInputEvent::GestureLongPress:
-    case WebInputEvent::GestureLongTap: {
-        if (!mainFrameImpl() || !mainFrameImpl()->frameView())
-            break;
-        eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(platformEvent);
-        break;
-    }
-    case WebInputEvent::GestureShowPress: {
-        eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(platformEvent);
-        break;
-    }
-    case WebInputEvent::GestureDoubleTap:
-        // GestureDoubleTap is currently only used by Android for zooming. For WebCore,
-        // GestureTap with tap count = 2 is used instead. So we drop GestureDoubleTap here.
-        eventSwallowed = true;
-        break;
-    case WebInputEvent::GestureScrollBegin:
-    case WebInputEvent::GesturePinchBegin:
-    case WebInputEvent::GestureTapDown:
-    case WebInputEvent::GestureScrollEnd:
-    case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
-    case WebInputEvent::GestureTapCancel:
-    case WebInputEvent::GestureTapUnconfirmed:
-    case WebInputEvent::GesturePinchEnd:
-    case WebInputEvent::GesturePinchUpdate:
-    case WebInputEvent::GestureFlingStart: {
-        eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(platformEvent);
-        break;
-    }
-    default:
-        ASSERT_NOT_REACHED();
-    }
-    m_client->didHandleGestureEvent(event, eventCancelled);
-    return eventSwallowed;
-}
-
 void WebViewImpl::setShowPaintRects(bool show)
 {
     m_showPaintRects = show;
 }
 
 void WebViewImpl::setShowDebugBorders(bool show)
 {
     m_showDebugBorders = show;
 }
 
@@ skipping 271 matching lines @@
     FrameView* view = m_page->mainFrame()->view();
     if (view) {
         gc.clip(dirtyRect);
         view->paint(&gc, dirtyRect);
     } else {
         gc.fillRect(dirtyRect, Color::white);
     }
     gc.restore();
 }
 
-const WebInputEvent* WebViewImpl::m_currentInputEvent = 0;
-
 // FIXME: autogenerate this kind of code, and use it throughout Blink rather than
 // the one-offs for subsets of these values.
 static String inputTypeToName(WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::KeyDown:
         return EventTypeNames::keydown;
     case WebInputEvent::KeyUp:
         return EventTypeNames::keyup;
     case WebInputEvent::GestureScrollBegin:
@@ skipping 12 matching lines @@
         return EventTypeNames::gesturetapunconfirmed;
     default:
         return String("unknown");
     }
 }
 
 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
 {
     TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToName(inputEvent.type).ascii().data());
 
-    TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent, &inputEvent);
-
     if (WebInputEvent::isPointerEventType(inputEvent.type)) {
         const WebPointerEvent& event = static_cast<const WebPointerEvent&>(inputEvent);
         return m_page->mainFrame()->newEventHandler().handlePointerEvent(event);
     }
 
+    if (WebInputEvent::isGestureEventType(inputEvent.type)) {
+        const WebGestureEvent& event = static_cast<const WebGestureEvent&>(inputEvent);
+        return m_page->mainFrame()->newEventHandler().handleGestureEvent(event);
+    }
+
     switch (inputEvent.type) {
     case WebInputEvent::RawKeyDown:
     case WebInputEvent::KeyDown:
     case WebInputEvent::KeyUp:
         return handleKeyEvent(static_cast<const WebKeyboardEvent&>(inputEvent));
-
     case WebInputEvent::Char:
         return handleCharEvent(static_cast<const WebKeyboardEvent&>(inputEvent));
-    case WebInputEvent::GestureScrollBegin:
-    case WebInputEvent::GestureScrollEnd:
-    case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
-    case WebInputEvent::GestureFlingStart:
-    case WebInputEvent::GestureFlingCancel:
-    case WebInputEvent::GestureTap:
-    case WebInputEvent::GestureTapUnconfirmed:
-    case WebInputEvent::GestureTapDown:
-    case WebInputEvent::GestureShowPress:
-    case WebInputEvent::GestureTapCancel:
-    case WebInputEvent::GestureDoubleTap:
-    case WebInputEvent::GestureTwoFingerTap:
-    case WebInputEvent::GestureLongPress:
-    case WebInputEvent::GestureLongTap:
-        return handleGestureEvent(static_cast<const WebGestureEvent&>(inputEvent));
-
-    case WebInputEvent::GesturePinchBegin:
-    case WebInputEvent::GesturePinchEnd:
-    case WebInputEvent::GesturePinchUpdate:
-        // FIXME: Once PlatformGestureEvent is updated to support pinch, this
-        // should call handleGestureEvent, just like it currently does for
-        // gesture scroll.
-        return false;
-
     default:
         return false;
     }
 }
 
 void WebViewImpl::mouseCaptureLost()
 {
     TRACE_EVENT_ASYNC_END0("input", "capturing mouse", this);
     m_mouseCaptureNode = nullptr;
 }
@@ skipping 552 matching lines @@
 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
                                      bool isInitialState) {
     if (!page())
         return;
 
     ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState == WebPageVisibilityStateHidden);
     m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 }
 
 } // namespace blink