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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10964051: events: Clean up dispatching code for touch-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 28162bc3b0f1056d11947b80fa22e1bd9bde504e..6f3fad07b61eee13936933e3f4ef42019e526567 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -110,15 +110,6 @@ BOOL CALLBACK ShowWindowsCallback(HWND window, LPARAM param) {
}
#endif
-ui::TouchStatus DecideTouchStatus(const WebKit::WebTouchEvent& event,
- WebKit::WebTouchPoint* point) {
- if (event.type == WebKit::WebInputEvent::TouchEnd &&
- event.touchesLength == 0)
- return ui::TOUCH_STATUS_QUEUED_END;
-
- return ui::TOUCH_STATUS_QUEUED;
-}
-
void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event,
WebKit::WebTouchPoint* point) {
if (point->state != WebKit::WebTouchPoint::StateReleased)
@@ -1525,8 +1516,7 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
return ui::ER_HANDLED;
}
-ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
- ui::TouchEvent* event) {
+ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnTouchEvent");
// Update the touch event first.
WebKit::WebTouchPoint* point = UpdateWebTouchEvent(event,
@@ -1537,10 +1527,10 @@ ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
if (point && host_->has_touch_handler()) {
host_->ForwardTouchEvent(touch_event_);
UpdateWebTouchEventAfterDispatch(&touch_event_, point);
- return DecideTouchStatus(touch_event_, point);
+ return ui::ER_ASYNC;
}
- return ui::TOUCH_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(

Powered by Google App Engine
This is Rietveld 408576698