Chromium Code Reviews| Index: ui/events/cocoa/events_mac.mm |
| diff --git a/ui/events/cocoa/events_mac.mm b/ui/events/cocoa/events_mac.mm |
| index 79beaf39305d486f2dfccf5c7a3c34b8f8927a89..7b1eb3144e6102962826f47c3cff2fce770cab8c 100644 |
| --- a/ui/events/cocoa/events_mac.mm |
| +++ b/ui/events/cocoa/events_mac.mm |
| @@ -178,24 +178,20 @@ int GetTouchId(const base::NativeEvent& native_event) { |
| return 0; |
| } |
| -float GetTouchRadiusX(const base::NativeEvent& native_event) { |
| - NOTIMPLEMENTED(); |
| - return 0.f; |
| -} |
| - |
| -float GetTouchRadiusY(const base::NativeEvent& native_event) { |
| - NOTIMPLEMENTED(); |
| - return 0.f; |
| -} |
| - |
| float GetTouchAngle(const base::NativeEvent& native_event) { |
| NOTIMPLEMENTED(); |
| return 0.f; |
| } |
| -float GetTouchForce(const base::NativeEvent& native_event) { |
| +PointerDetails GetTouchPointerDetailsFromNative( |
| + const base::NativeEvent& native_event) { |
| NOTIMPLEMENTED(); |
| - return 0.f; |
| + return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, |
|
sadrul
2016/01/15 17:24:11
POINTER_TYPE_UNKNOWN?
robert.bradford
2016/01/18 15:25:22
Done.
|
| + /* radius_x */ 1.0, |
| + /* radius_y */ 1.0, |
| + /* force */ 0.f, |
| + /* tilt_x */ 0.f, |
| + /* tilt_y */ 0.f); |
| } |
| bool GetScrollOffsets(const base::NativeEvent& native_event, |