Overhaul Mandoline event transport code

components/html_viewer/touch_handler.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/touch_handler.h"
 
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/mojo/events/input_events.mojom.h"
 
 namespace html_viewer {
 namespace {
 
+// TODO(rjkroege): Gesture recognition currently happens in the html_viewer.
+// In phase2, it will be relocated to MUS. Update this code at that time.
 void SetPropertiesFromEvent(const mojo::Event& event,
                             ui::PointerProperties* properties) {
   properties->id = event.pointer_data->pointer_id;
-  properties->x = event.pointer_data->x;
-  properties->y = event.pointer_data->y;
-  properties->raw_x = event.pointer_data->screen_x;
-  properties->raw_y = event.pointer_data->screen_y;
-  properties->pressure = event.pointer_data->pressure;
-  properties->SetAxesAndOrientation(event.pointer_data->radius_major,
-                                    event.pointer_data->radius_minor,
-                                    event.pointer_data->orientation);
+  properties->x = event.pointer_data->where->x;
+  properties->y = event.pointer_data->where->y;
+  properties->raw_x = event.pointer_data->where->screen_x;
+  properties->raw_y = event.pointer_data->where->screen_y;
+
+  if (event.pointer_data->kind == mojo::POINTER_KIND_TOUCH ||
+      event.pointer_data->kind == mojo::POINTER_KIND_PEN) {
+    properties->pressure = event.pointer_data->brush_data->pressure;
+
+    // TODO(rjkroege): vary orientation for width, height.
+    properties->SetAxesAndOrientation(event.pointer_data->brush_data->width,
+                                      event.pointer_data->brush_data->height,
+                                      0.0);
+  } else {
+    if (event.flags & mojo::EVENT_FLAGS_LEFT_MOUSE_BUTTON ||
+        event.flags & mojo::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON ||
+        event.flags & mojo::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) {
+      properties->pressure = 0.5;
+    } else {
+      properties->pressure = 0.0;
+    }
+  }
   // TODO(sky): Add support for tool_type.
 }
 
 }  // namespace
 
 TouchHandler::TouchHandler(blink::WebWidget* web_widget)
     : web_widget_(web_widget),
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this) {
@@ skipping 141 matching lines @@
     case mojo::EVENT_TYPE_POINTER_CANCEL:
       current_motion_event_.reset();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace html_viewer