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

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

Issue 9549020: Improve switch between gestures and touch mode when kEnableTouchEvents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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.cc
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index a760a0dec9a35d888a6ff068a57d0ec2bc809cf4..5fb05992731e7d4664ff871de7e7ca9179808a22 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -1253,7 +1253,7 @@ void RenderWidgetHostImpl::OnMsgInputEventAck(WebInputEvent::Type event_type,
} else if (type == WebInputEvent::MouseWheel) {
ProcessWheelAck(processed);
} else if (WebInputEvent::isTouchEventType(type)) {
- ProcessTouchAck(processed);
+ ProcessTouchAck(event_type, processed);
}
// This is used only for testing.
content::NotificationService::current()->Notify(
@@ -1277,9 +1277,10 @@ void RenderWidgetHostImpl::ProcessWheelAck(bool processed) {
view_->UnhandledWheelEvent(current_wheel_event_);
}
-void RenderWidgetHostImpl::ProcessTouchAck(bool processed) {
+void RenderWidgetHostImpl::ProcessTouchAck(
+ WebInputEvent::Type type, bool processed) {
if (view_)
- view_->ProcessTouchAck(processed);
+ view_->ProcessTouchAck(type, processed);
}
void RenderWidgetHostImpl::OnMsgFocus() {
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698