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

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

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 1651dd0b763910135cfc6077f7100321ad40fc5c..b0ba2c473efd8e567f32053b6db68c1fe4bc8b2f 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1682,14 +1682,14 @@ ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
return result;
}
-ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
- ui::GestureEvent* event) {
+void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {
TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnGestureEvent");
// Pinch gestures are currently disabled by default. See crbug.com/128477.
if ((event->type() == ui::ET_GESTURE_PINCH_BEGIN ||
event->type() == ui::ET_GESTURE_PINCH_UPDATE ||
event->type() == ui::ET_GESTURE_PINCH_END) && !ShouldSendPinchGesture()) {
- return ui::ER_CONSUMED;
+ event->SetHandled();
+ return;
}
RenderViewHostDelegate* delegate = NULL;
@@ -1728,10 +1728,8 @@ ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
}
// If a gesture is not processed by the webpage, then WebKit processes it
- // (e.g. generates synthetic mouse events). So CONSUMED should be returned
- // from here to avoid any duplicate synthetic mouse-events being generated
- // from aura.
- return ui::ER_CONSUMED;
+ // (e.g. generates synthetic mouse events).
+ event->SetHandled();
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698