Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: sky/shell/ui/input_event_converter.cc

Issue 970493003: Add support for pressure on pointer events (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/shell/ui/input_event_converter.h" 5 #include "sky/shell/ui/input_event_converter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "sky/engine/public/platform/WebInputEvent.h" 9 #include "sky/engine/public/platform/WebInputEvent.h"
10 10
(...skipping 23 matching lines...) Expand all
34 NOTIMPLEMENTED() << "Received unexpected event: " << event->type; 34 NOTIMPLEMENTED() << "Received unexpected event: " << event->type;
35 break; 35 break;
36 } 36 }
37 37
38 if (event->pointer_data) { 38 if (event->pointer_data) {
39 if (event->pointer_data->kind == POINTER_KIND_TOUCH) 39 if (event->pointer_data->kind == POINTER_KIND_TOUCH)
40 web_event->kind = blink::WebPointerEvent::Touch; 40 web_event->kind = blink::WebPointerEvent::Touch;
41 web_event->pointer = event->pointer_data->pointer; 41 web_event->pointer = event->pointer_data->pointer;
42 web_event->x = event->pointer_data->x / device_pixel_ratio; 42 web_event->x = event->pointer_data->x / device_pixel_ratio;
43 web_event->y = event->pointer_data->y / device_pixel_ratio; 43 web_event->y = event->pointer_data->y / device_pixel_ratio;
44 web_event->pressure = event->pointer_data->pressure;
45 web_event->pressureMin = event->pointer_data->pressure_min;
46 web_event->pressureMax = event->pointer_data->pressure_max;
44 } 47 }
45 48
46 return web_event.Pass(); 49 return web_event.Pass();
47 } 50 }
48 51
49 scoped_ptr<blink::WebInputEvent> BuildWebGestureEvent( 52 scoped_ptr<blink::WebInputEvent> BuildWebGestureEvent(
50 const InputEventPtr& event, float device_pixel_ratio) { 53 const InputEventPtr& event, float device_pixel_ratio) {
51 scoped_ptr<blink::WebGestureEvent> web_event(new blink::WebGestureEvent); 54 scoped_ptr<blink::WebGestureEvent> web_event(new blink::WebGestureEvent);
52 55
53 web_event->timeStampMS = event->time_stamp; 56 web_event->timeStampMS = event->time_stamp;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 case EVENT_TYPE_GESTURE_FLING_CANCEL: 108 case EVENT_TYPE_GESTURE_FLING_CANCEL:
106 return BuildWebGestureEvent(event, device_pixel_ratio); 109 return BuildWebGestureEvent(event, device_pixel_ratio);
107 case EVENT_TYPE_UNKNOWN: 110 case EVENT_TYPE_UNKNOWN:
108 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN"; 111 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN";
109 } 112 }
110 113
111 return scoped_ptr<blink::WebInputEvent>(); 114 return scoped_ptr<blink::WebInputEvent>();
112 } 115 }
113 116
114 } // namespace mojo 117 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698