Pass gesture detector config type when enabling touch emulator.

content/browser/renderer_host/input/touch_emulator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/touch_emulator.h"
 
 #include "content/browser/renderer_host/input/motion_event_web.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "content/grit/content_resources.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace content {
 
 namespace {
 
-ui::GestureProvider::Config GetGestureProviderConfig() {
-  // TODO(dgozman): Use different configs to emulate mobile/desktop as
-  // requested by renderer, crbug/425586.
-  ui::GestureProvider::Config config = ui::GetGestureProviderConfig(
-      ui::GestureProviderConfigType::GENERIC_MOBILE);
+ui::GestureProvider::Config GetEmulatorGestureProviderConfig(
+    ui::GestureProviderConfigType config_type) {
+  ui::GestureProvider::Config config =
+      ui::GetGestureProviderConfig(config_type);
   config.gesture_begin_end_types_enabled = false;
   config.gesture_detector_config.swipe_enabled = false;
   config.gesture_detector_config.two_finger_tap_enabled = false;
   return config;
 }
 
 // Time between two consecutive mouse moves, during which second mouse move
 // is not converted to touch.
 const double kMouseMoveDropIntervalSeconds = 5.f / 1000;
 
@@ skipping 32 matching lines @@
 void TouchEmulator::ResetState() {
   last_mouse_event_was_move_ = false;
   last_mouse_move_timestamp_ = 0;
   mouse_pressed_ = false;
   shift_pressed_ = false;
   suppress_next_fling_cancel_ = false;
   pinch_scale_ = 1.f;
   pinch_gesture_active_ = false;
 }
 
-void TouchEmulator::Enable() {
-  if (!gesture_provider_) {
-    gesture_provider_.reset(new ui::FilteredGestureProvider(
-        GetGestureProviderConfig(), this));
-    // TODO(dgozman): Use synthetic secondary touch to support multi-touch.
-    gesture_provider_->SetMultiTouchZoomSupportEnabled(false);
-    // TODO(dgozman): Enable double tap if requested by the renderer.
-    // TODO(dgozman): Don't break double-tap-based pinch with shift handling.
-    gesture_provider_->SetDoubleTapSupportForPlatformEnabled(false);
-
-    ResetState();
-  }
+void TouchEmulator::Enable(ui::GestureProviderConfigType config_type) {
+  gesture_provider_.reset(new ui::FilteredGestureProvider(

[jdduke (slow), 2014/12/30 18:13:00]

I'm a little concerned about repeated enables (without an intervening
Disable()), either of the same type or of different types, particularly when
there's an active touch sequence. 

[dgozman, 2015/01/14 14:00:23]

Yeah, but what else can we do?
With this code, renderer could get a broken gesture sequence (i.e. pinch start
with pinch end), but all touches should be in correct order. Is this a problem?

+      GetEmulatorGestureProviderConfig(config_type), this));
+  // TODO(dgozman): Use synthetic secondary touch to support multi-touch.
+  gesture_provider_->SetMultiTouchZoomSupportEnabled(false);
+  // TODO(dgozman): Enable double tap if requested by the renderer.
+  // TODO(dgozman): Don't break double-tap-based pinch with shift handling.
+  gesture_provider_->SetDoubleTapSupportForPlatformEnabled(false);
   UpdateCursor();
 }
 
 void TouchEmulator::Disable() {
   if (!gesture_provider_)
     return;
 
   UpdateCursor();
   CancelTouch();
   gesture_provider_.reset();
+  ResetState();
 }
 
 gfx::SizeF TouchEmulator::InitCursorFromResource(
     WebCursor* cursor, float scale, int resource_id) {
   gfx::Image& cursor_image =
       content::GetContentClient()->GetNativeImageNamed(resource_id);
   WebCursor::CursorInfo cursor_info;
   cursor_info.type = blink::WebCursorInfo::TypeCustom;
   cursor_info.image_scale_factor = scale;
   cursor_info.custom_image = cursor_image.AsBitmap();
@@ skipping 316 matching lines @@
   point.screenPosition.x = mouse_event.globalX;
   point.position.y = mouse_event.y;
   point.screenPosition.y = mouse_event.globalY;
 }
 
 bool TouchEmulator::InPinchGestureMode() const {
   return shift_pressed_;
 }
 
 }  // namespace content