Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1834)

Unified Diff: sky/engine/core/frame/NewEventHandler.cpp

Issue 874823002: Move GestureEvent to NewEventDispatcher (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Build fixes Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/frame/NewEventHandler.h ('k') | sky/engine/core/page/EventHandler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/NewEventHandler.cpp
diff --git a/sky/engine/core/frame/NewEventHandler.cpp b/sky/engine/core/frame/NewEventHandler.cpp
index 7e46724163b5af5f1b2ff5a0f9cff9f2f5ec7903..ebafd720e8150ad276fcb760f536310b8498c9fc 100644
--- a/sky/engine/core/frame/NewEventHandler.cpp
+++ b/sky/engine/core/frame/NewEventHandler.cpp
@@ -10,6 +10,7 @@
#include "sky/engine/core/editing/Editor.h"
#include "sky/engine/core/editing/FrameSelection.h"
#include "sky/engine/core/editing/htmlediting.h"
+#include "sky/engine/core/events/GestureEvent.h"
#include "sky/engine/core/events/PointerEvent.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/frame/FrameView.h"
@@ -30,7 +31,8 @@ static VisiblePosition visiblePositionForHitTestResult(const HitTestResult& hitT
return VisiblePosition(firstPositionInOrBeforeNode(innerNode), DOWNSTREAM);
}
-static LayoutPoint positionForEvent(const WebPointerEvent& event)
+template<typename EventType>
+static LayoutPoint positionForEvent(const EventType& event)
{
return roundedLayoutPoint(FloatPoint(event.x, event.y));
}
@@ -71,6 +73,12 @@ bool NewEventHandler::dispatchPointerEvent(Node& target, const WebPointerEvent&
return target.dispatchEvent(pointerEvent.release());
}
+bool NewEventHandler::dispatchGestureEvent(Node& target, const WebGestureEvent& event)
+{
+ RefPtr<GestureEvent> gestureEvent = GestureEvent::create(event);
+ return target.dispatchEvent(gestureEvent.release());
+}
+
bool NewEventHandler::dispatchClickEvent(Node& capturingTarget, const WebPointerEvent& event)
{
ASSERT(event.type == WebInputEvent::PointerUp);
@@ -109,6 +117,13 @@ bool NewEventHandler::handlePointerEvent(const WebPointerEvent& event)
return handlePointerCancelEvent(event);
}
+bool NewEventHandler::handleGestureEvent(const WebGestureEvent& event)
+{
+ HitTestResult hitTestResult = performHitTest(positionForEvent(event));
+ RefPtr<Node> target = targetForHitTestResult(hitTestResult);
+ return !dispatchGestureEvent(*target, event);
+}
+
bool NewEventHandler::handlePointerDownEvent(const WebPointerEvent& event)
{
ASSERT(m_targetForPointer.find(event.pointer) == m_targetForPointer.end());
« no previous file with comments | « sky/engine/core/frame/NewEventHandler.h ('k') | sky/engine/core/page/EventHandler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698