Overhaul Mandoline event transport code

components/html_viewer/html_frame.cc

 // Copyright 2015 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 "components/html_viewer/html_frame.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 443 matching lines @@
 void HTMLFrame::OnViewDestroyed(View* view) {
   DCHECK_EQ(view, view_);
   view_->RemoveObserver(this);
   view_ = nullptr;
   Close();
 }
 
 void HTMLFrame::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
   if (event->pointer_data) {
     // Blink expects coordintes to be in DIPs.
-    event->pointer_data->x /= global_state()->device_pixel_ratio();
-    event->pointer_data->y /= global_state()->device_pixel_ratio();
-    event->pointer_data->screen_x /= global_state()->device_pixel_ratio();
-    event->pointer_data->screen_y /= global_state()->device_pixel_ratio();
+    event->pointer_data->where->x /= global_state()->device_pixel_ratio();
+    event->pointer_data->where->y /= global_state()->device_pixel_ratio();
+    event->pointer_data->where->screen_x /=
+        global_state()->device_pixel_ratio();
+    event->pointer_data->where->screen_y /=
+        global_state()->device_pixel_ratio();
   }
 
   blink::WebWidget* web_widget = GetWebWidget();
 
   if (!touch_handler_ && web_widget)
     touch_handler_.reset(new TouchHandler(web_widget));
 
   if (touch_handler_ && (event->action == mojo::EVENT_TYPE_POINTER_DOWN ||
                          event->action == mojo::EVENT_TYPE_POINTER_UP ||
                          event->action == mojo::EVENT_TYPE_POINTER_CANCEL ||
@@ skipping 325 matching lines @@
 
 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
   NOTIMPLEMENTED();
 }
 
 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace mojo