Set the correct pressure for pointer events based on force

content/browser/renderer_host/web_input_event_aura.cc

 // Copyright (c) 2012 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/web_input_event_aura.h"
 
 #include "build/build_config.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 383 matching lines @@
     case ui::ET_MOUSE_DRAGGED:
       webkit_event.type = blink::WebInputEvent::MouseMove;
       break;
     default:
       NOTIMPLEMENTED() << "Received unexpected event: " << event.type();
       break;
   }
 
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x());
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y());
-  webkit_event.force = event.pointer_details().force();
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type());
 
+  // TODO(crbug.com/581066): Set mouse pressure if it is supported
+   if (webkit_event.pointerType !=
+       blink::WebPointerProperties::PointerType::Mouse)
+       webkit_event.force = event.pointer_details().force();

[sadrul, 2016/01/27 18:31:44]

Can we update the default value for |ui::PointerDetails::force_| instead, so
that we can unconditionally set this here. The lower level layer which creates
the ui events should be responsible for setting the right value if/when the
platform supports it.

[Navid Zolghadr, 2016/01/27 19:55:48]

That would practically add a lot more implications and makes this CL a lot
bigger particularly about touch cases. That is why we have it like this to have
the changes mostly in Blink for this CL. Later that we add the support for Mac
force touch pad I will clean up the Chrome side as well. So I will merge this
change as is if you are okay with that.

[sadrul, 2016/01/27 20:22:05]

Can you clarify why you think that would make this CL any bigger? Does it
involve anything other than changing the default initialization value of
|ui::PointerDetails::force_|?

[Navid Zolghadr, 2016/01/28 18:38:38]

Done.

+
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::MouseWheelEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
   webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
 
   if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
   } else {
     webkit_event.deltaX = event.x_offset();
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x());
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y());
-  webkit_event.force = event.pointer_details().force();
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type());
 
+  // TODO(crbug.com/581066): Set mouse pressure if it is supported
+   if (webkit_event.pointerType !=
+       blink::WebPointerProperties::PointerType::Mouse)
+       webkit_event.force = event.pointer_details().force();

[sadrul, 2016/01/27 18:31:44]

ditto

+
   return webkit_event;
 }
 
 }  // namespace content