Removed references to the old sourceDevice field

Now that the new sourceDevice field introduced in WebGestureEvent is
used in WebKit, we can safely remove references to the old one (in
WebGestureEvent::data.flingStart) in Chromium, so that the old one can
be completely removed from WebKit.

BUG=164389


Review URL: https://chromiumcodereview.appspot.com/11740009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175463 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 1 insertions, 17 deletions

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index ed5ec24..0d8b23b 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -896,9 +896,6 @@ void ContentViewCoreImpl::FlingStart(JNIEnv* env, jobject obj, jlong time_ms,
       WebInputEvent::GestureFlingStart, time_ms, x, y);
   event.data.flingStart.velocityX = vx / DpiScale();
   event.data.flingStart.velocityY = vy / DpiScale();
-  // FIXME(mohsen || rjkroege): Remove following line after removing uses of
-  // flingStart.sourceDevice in WebKit, but before removing the field itself.
-  event.data.flingStart.sourceDevice = WebGestureEvent::Touchscreen;
 
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SendGestureEvent(event);
diff --git a/content/browser/renderer_host/gesture_event_filter.cc b/content/browser/renderer_host/gesture_event_filter.cc
index 2484289..555eee4 100644
--- a/content/browser/renderer_host/gesture_event_filter.cc
+++ b/content/browser/renderer_host/gesture_event_filter.cc
@@ -121,7 +121,7 @@ bool GestureEventFilter::ShouldForwardForBounceReduction(
 bool GestureEventFilter::ShouldForward(const WebGestureEvent& gesture_event) {
   // Discard a zero-velocity fling start from the trackpad.
   if (gesture_event.type == WebInputEvent::GestureFlingStart &&
-      gesture_event.data.flingStart.sourceDevice == WebGestureEvent::Touchpad &&
+      gesture_event.sourceDevice == WebGestureEvent::Touchpad &&
       gesture_event.data.flingStart.velocityX == 0 &&
       gesture_event.data.flingStart.velocityY == 0) {
     return false;
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index d425dfe..bf02e59 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -587,9 +587,6 @@ class RenderWidgetHostTest : public testing::Test {
       float velocityY,
       WebGestureEvent::SourceDevice sourceDevice) {
     WebGestureEvent gesture_event;
-    // FIXME(mohsen || rjkroege): Remove following line after removing uses of
-    // flingStart.sourceDevice in WebKit, but before removing the field itself.
-    gesture_event.data.flingStart.sourceDevice = sourceDevice;
     gesture_event.data.flingStart.velocityX = velocityX;
     gesture_event.data.flingStart.velocityY = velocityY;
     SimulateGestureEventCore(WebInputEvent::GestureFlingStart, sourceDevice,
diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc
index b555837..9358463 100644
--- a/content/browser/renderer_host/ui_events_helper.cc
+++ b/content/browser/renderer_host/ui_events_helper.cc
@@ -189,11 +189,6 @@ WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent(
       gesture_event.type = WebKit::WebInputEvent::GestureFlingStart;
       gesture_event.data.flingStart.velocityX = event.details().velocity_x();
       gesture_event.data.flingStart.velocityY = event.details().velocity_y();
-      // FIXME(mohsen || rjkroege): Remove following line after removing uses of
-      // flingStart.sourceDevice in WebKit, but before removing the field
-      // itself.
-      gesture_event.data.flingStart.sourceDevice =
-          WebKit::WebGestureEvent::Touchscreen;
       break;
     case ui::ET_SCROLL_FLING_CANCEL:
       gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc
index 9ef6a63..122c345 100644
--- a/content/browser/renderer_host/web_input_event_aurax11.cc
+++ b/content/browser/renderer_host/web_input_event_aurax11.cc
@@ -162,11 +162,6 @@ WebKit::WebGestureEvent MakeWebGestureEventFromAuraEvent(
       webkit_event.type = WebKit::WebInputEvent::GestureFlingStart;
       webkit_event.data.flingStart.velocityX = event->x_offset();
       webkit_event.data.flingStart.velocityY = event->y_offset();
-      // FIXME(mohsen || rjkroege): Remove following line after removing uses of
-      // flingStart.sourceDevice in WebKit, but before removing the field
-      // itself.
-      webkit_event.data.flingStart.sourceDevice =
-          WebKit::WebGestureEvent::Touchpad;
       break;
     case ui::ET_SCROLL_FLING_CANCEL:
       webkit_event.type = WebKit::WebInputEvent::GestureFlingCancel;