Revert 271026 "[DevTools] Interactive test for DevTools touch em..."

trunk/src/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/public/common/content_client.h"
@@ skipping 113 matching lines @@
   cursor->InitFromCursorInfo(cursor_info);
 }
 
 bool TouchEmulator::HandleMouseEvent(const WebMouseEvent& mouse_event) {
   if (!enabled_)
     return false;
 
   if (mouse_event.button != WebMouseEvent::ButtonLeft)
     return true;
 
-  if (mouse_event.type == WebInputEvent::MouseMove &&
-      mouse_event.timeStampSeconds) {
+  if (mouse_event.type == WebInputEvent::MouseMove) {
     if (last_mouse_event_was_move_ &&
         mouse_event.timeStampSeconds < last_mouse_move_timestamp_ +
             kMouseMoveDropIntervalSeconds)
       return true;
 
     last_mouse_event_was_move_ = true;
     last_mouse_move_timestamp_ = mouse_event.timeStampSeconds;
   } else {
     last_mouse_event_was_move_ = false;
   }
@@ skipping 164 matching lines @@
 }
 
 void TouchEmulator::PinchEnd(const WebGestureEvent& event) {
   DCHECK(pinch_gesture_active_);
   pinch_gesture_active_ = false;
   FillPinchEvent(event);
   pinch_event_.type = WebInputEvent::GesturePinchEnd;
   client_->ForwardGestureEvent(pinch_event_);
 }
 
-void TouchEmulator::FillPinchEvent(const WebGestureEvent& event) {
+void TouchEmulator::FillPinchEvent(const WebInputEvent& event) {
   pinch_event_.timeStampSeconds = event.timeStampSeconds;
   pinch_event_.modifiers = event.modifiers;
   pinch_event_.sourceDevice = blink::WebGestureEvent::Touchscreen;
   pinch_event_.x = pinch_anchor_.x();
   pinch_event_.y = pinch_anchor_.y();
 }
 
 void TouchEmulator::ScrollEnd(const WebGestureEvent& event) {
   WebGestureEvent scroll_event;
   scroll_event.timeStampSeconds = event.timeStampSeconds;
@@ skipping 25 matching lines @@
       break;
     default:
       eventType = WebInputEvent::Undefined;
       NOTREACHED();
   }
   touch_event_.touchesLength = 1;
   touch_event_.modifiers = mouse_event.modifiers;
   WebTouchEventTraits::ResetTypeAndTouchStates(
       eventType, mouse_event.timeStampSeconds, &touch_event_);
 
-  if (!touch_event_.timeStampSeconds) {
-    // Gesture detector does not tolerate null timestamps generated in tests.
-    touch_event_.timeStampSeconds =
-        (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
-  }
-
   WebTouchPoint& point = touch_event_.touches[0];
   point.id = 0;
   point.radiusX = point.radiusY = 1.f;
   point.force = 1.f;
   point.rotationAngle = 0.f;
   point.position.x = mouse_event.x;
   point.screenPosition.x = mouse_event.globalX;
   point.position.y = mouse_event.y;
   point.screenPosition.y = mouse_event.globalY;
 
   return true;
 }
 
 bool TouchEmulator::InPinchGestureMode() const {
   return shift_pressed_ && allow_pinch_;
 }
 
 }  // namespace content