WebMouseEvent coordinates are now fractional & private

ui/events/blink/input_handler_proxy.cc

 // Copyright 2013 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 "ui/events/blink/input_handler_proxy.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 496 matching lines @@
         input_handler_->MouseUp();
       }
       return DID_NOT_HANDLE;
     }
     case WebInputEvent::MouseMove: {
       const WebMouseEvent& mouse_event =
           static_cast<const WebMouseEvent&>(event);
       // TODO(davemoore): This should never happen, but bug #326635 showed some
       // surprising crashes.
       CHECK(input_handler_);
-      input_handler_->MouseMoveAt(gfx::Point(mouse_event.x, mouse_event.y));
+      input_handler_->MouseMoveAt(
+          gfx::Point(mouse_event.position.x, mouse_event.position.y));
       return DID_NOT_HANDLE;
     }
     case WebInputEvent::MouseLeave: {
       CHECK(input_handler_);
       input_handler_->MouseLeave();
       return DID_NOT_HANDLE;
     }
 
     default:
       if (WebInputEvent::isKeyboardEventType(event.type())) {
@@ skipping 170 matching lines @@
   if (touchpad_and_wheel_scroll_latching_enabled_) {
     if (gesture_scroll_on_impl_thread_) {
       TRACE_EVENT_INSTANT2("input",
                            "InputHandlerProxy::handle_input wheel scroll",
                            TRACE_EVENT_SCOPE_THREAD, "deltaX", scroll_delta.x(),
                            "deltaY", scroll_delta.y());
 
       cc::ScrollStateData scroll_state_update_data;
       scroll_state_update_data.delta_x = scroll_delta.x();
       scroll_state_update_data.delta_y = scroll_delta.y();
-      scroll_state_update_data.position_x = wheel_event.x;
-      scroll_state_update_data.position_y = wheel_event.y;
+      scroll_state_update_data.position_x = wheel_event.position.x;
+      scroll_state_update_data.position_y = wheel_event.position.y;
       cc::ScrollState scroll_state_update(scroll_state_update_data);
 
       cc::InputHandlerScrollResult scroll_result =
           input_handler_->ScrollBy(&scroll_state_update);
-      HandleOverscroll(gfx::Point(wheel_event.x, wheel_event.y), scroll_result,
-                       false);
+      HandleOverscroll(
+          gfx::Point(wheel_event.position.x, wheel_event.position.y),
+          scroll_result, false);
       if (scroll_result.did_scroll) {
         return listener_properties == cc::EventListenerProperties::kPassive
                    ? DID_HANDLE_NON_BLOCKING
                    : DID_HANDLE;
       }
 
       return DROP_EVENT;
     } else {
       return DID_NOT_HANDLE;
     }
   } else {  // !touchpad_and_wheel_scroll_latching_enabled_
     cc::ScrollStateData scroll_state_begin_data;
-    scroll_state_begin_data.position_x = wheel_event.x;
-    scroll_state_begin_data.position_y = wheel_event.y;
+    scroll_state_begin_data.position_x = wheel_event.position.x;
+    scroll_state_begin_data.position_y = wheel_event.position.y;
     scroll_state_begin_data.is_beginning = true;
     cc::ScrollState scroll_state_begin(scroll_state_begin_data);
     cc::InputHandler::ScrollStatus scroll_status = input_handler_->ScrollBegin(
         &scroll_state_begin, cc::InputHandler::WHEEL);
 
     RecordMainThreadScrollingReasons(
         blink::WebGestureDeviceTouchpad,
         scroll_status.main_thread_scrolling_reasons);
 
     mouse_wheel_result_ =
         (listener_properties == cc::EventListenerProperties::kPassive)
             ? DID_HANDLE_NON_BLOCKING
             : DROP_EVENT;
     RecordScrollingThreadStatus(blink::WebGestureDeviceTouchpad,
                                 scroll_status.main_thread_scrolling_reasons);
 
     switch (scroll_status.thread) {
       case cc::InputHandler::SCROLL_ON_IMPL_THREAD: {
         TRACE_EVENT_INSTANT2("input",
                              "InputHandlerProxy::handle_input wheel scroll",
                              TRACE_EVENT_SCOPE_THREAD, "deltaX",
                              scroll_delta.x(), "deltaY", scroll_delta.y());
 
         cc::ScrollStateData scroll_state_update_data;
         scroll_state_update_data.delta_x = scroll_delta.x();
         scroll_state_update_data.delta_y = scroll_delta.y();
-        scroll_state_update_data.position_x = wheel_event.x;
-        scroll_state_update_data.position_y = wheel_event.y;
+        scroll_state_update_data.position_x = wheel_event.position.x;
+        scroll_state_update_data.position_y = wheel_event.position.y;
         cc::ScrollState scroll_state_update(scroll_state_update_data);
 
         cc::InputHandlerScrollResult scroll_result =
             input_handler_->ScrollBy(&scroll_state_update);
-        HandleOverscroll(gfx::Point(wheel_event.x, wheel_event.y),
-                         scroll_result, false);
+        HandleOverscroll(
+            gfx::Point(wheel_event.position.x, wheel_event.position.y),
+            scroll_result, false);
 
         cc::ScrollStateData scroll_state_end_data;
         scroll_state_end_data.is_ending = true;
         cc::ScrollState scroll_state_end(scroll_state_end_data);
         input_handler_->ScrollEnd(&scroll_state_end);
 
         if (scroll_result.did_scroll) {
           return listener_properties == cc::EventListenerProperties::kPassive
                      ? DID_HANDLE_NON_BLOCKING
                      : DID_HANDLE;
@@ skipping 707 matching lines @@
       disposition = DID_NOT_HANDLE;
       break;
     case cc::EventListenerProperties::kPassive:
     case cc::EventListenerProperties::kNone: {
       WebMouseWheelEvent synthetic_wheel(WebInputEvent::MouseWheel,
                                          fling_parameters_.modifiers,
                                          InSecondsF(base::TimeTicks::Now()));
       synthetic_wheel.deltaX = increment.width;
       synthetic_wheel.deltaY = increment.height;
       synthetic_wheel.hasPreciseScrollingDeltas = true;
-      synthetic_wheel.x = fling_parameters_.point.x;
-      synthetic_wheel.y = fling_parameters_.point.y;
-      synthetic_wheel.globalX = fling_parameters_.globalPoint.x;
-      synthetic_wheel.globalY = fling_parameters_.globalPoint.y;
+      synthetic_wheel.position.x = fling_parameters_.point.x;
+      synthetic_wheel.position.y = fling_parameters_.point.y;
+      synthetic_wheel.screenPosition.x = fling_parameters_.globalPoint.x;
+      synthetic_wheel.screenPosition.y = fling_parameters_.globalPoint.y;
 
       disposition = FlingScrollByMouseWheel(synthetic_wheel, properties);
 
       // Send the event over to the main thread.
       if (disposition == DID_HANDLE_NON_BLOCKING) {
         client_->DispatchNonBlockingEventToMainThread(
             ui::WebInputEventTraits::Clone(synthetic_wheel), ui::LatencyInfo());
       }
       break;
     }
@@ skipping 111 matching lines @@
                  scroll_elasticity_controller_->GetWeakPtr(), gesture_event,
                  scroll_result));
 }
 
 void InputHandlerProxy::SetTickClockForTesting(
     std::unique_ptr<base::TickClock> tick_clock) {
   tick_clock_ = std::move(tick_clock);
 }
 
 }  // namespace ui