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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 997073003: Wire up gesturetap in SkyShell (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
« no previous file with comments | « sky/shell/org/domokit/sky/shell/GestureProvider.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 case EVENT_TYPE_GESTURE_FLING_START: 72 case EVENT_TYPE_GESTURE_FLING_START:
73 web_event->type = blink::WebInputEvent::GestureFlingStart; 73 web_event->type = blink::WebInputEvent::GestureFlingStart;
74 web_event->data.flingStart.velocityX = 74 web_event->data.flingStart.velocityX =
75 event->gesture_data->velocityX / device_pixel_ratio; 75 event->gesture_data->velocityX / device_pixel_ratio;
76 web_event->data.flingStart.velocityY = 76 web_event->data.flingStart.velocityY =
77 event->gesture_data->velocityY / device_pixel_ratio; 77 event->gesture_data->velocityY / device_pixel_ratio;
78 break; 78 break;
79 case EVENT_TYPE_GESTURE_FLING_CANCEL: 79 case EVENT_TYPE_GESTURE_FLING_CANCEL:
80 web_event->type = blink::WebInputEvent::GestureFlingCancel; 80 web_event->type = blink::WebInputEvent::GestureFlingCancel;
81 break; 81 break;
82 case EVENT_TYPE_GESTURE_LONG_PRESS:
83 web_event->type = blink::WebInputEvent::GestureLongPress;
84 break;
85 case EVENT_TYPE_GESTURE_SHOW_PRESS:
86 web_event->type = blink::WebInputEvent::GestureShowPress;
87 break;
88 case EVENT_TYPE_GESTURE_TAP:
89 web_event->type = blink::WebInputEvent::GestureTap;
90 break;
91 case EVENT_TYPE_GESTURE_TAP_DOWN:
92 web_event->type = blink::WebInputEvent::GestureTapDown;
93 break;
82 default: 94 default:
83 break; 95 break;
84 } 96 }
85 97
86 if (event->gesture_data) { 98 if (event->gesture_data) {
87 web_event->x = event->gesture_data->x / device_pixel_ratio; 99 web_event->x = event->gesture_data->x / device_pixel_ratio;
88 web_event->y = event->gesture_data->y / device_pixel_ratio; 100 web_event->y = event->gesture_data->y / device_pixel_ratio;
89 } 101 }
90 102
91 return web_event.Pass(); 103 return web_event.Pass();
92 } 104 }
93 105
94 } // namespace 106 } // namespace
95 107
96 scoped_ptr<blink::WebInputEvent> ConvertEvent(const InputEventPtr& event, 108 scoped_ptr<blink::WebInputEvent> ConvertEvent(const InputEventPtr& event,
97 float device_pixel_ratio) { 109 float device_pixel_ratio) {
98 switch (event->type) { 110 switch (event->type) {
99 case EVENT_TYPE_POINTER_DOWN: 111 case EVENT_TYPE_POINTER_DOWN:
100 case EVENT_TYPE_POINTER_UP: 112 case EVENT_TYPE_POINTER_UP:
101 case EVENT_TYPE_POINTER_MOVE: 113 case EVENT_TYPE_POINTER_MOVE:
102 case EVENT_TYPE_POINTER_CANCEL: 114 case EVENT_TYPE_POINTER_CANCEL:
103 return BuildWebPointerEvent(event, device_pixel_ratio); 115 return BuildWebPointerEvent(event, device_pixel_ratio);
116 case EVENT_TYPE_GESTURE_FLING_CANCEL:
117 case EVENT_TYPE_GESTURE_FLING_START:
118 case EVENT_TYPE_GESTURE_LONG_PRESS:
104 case EVENT_TYPE_GESTURE_SCROLL_BEGIN: 119 case EVENT_TYPE_GESTURE_SCROLL_BEGIN:
120 case EVENT_TYPE_GESTURE_SCROLL_END:
105 case EVENT_TYPE_GESTURE_SCROLL_UPDATE: 121 case EVENT_TYPE_GESTURE_SCROLL_UPDATE:
106 case EVENT_TYPE_GESTURE_SCROLL_END: 122 case EVENT_TYPE_GESTURE_SHOW_PRESS:
107 case EVENT_TYPE_GESTURE_FLING_START: 123 case EVENT_TYPE_GESTURE_TAP:
108 case EVENT_TYPE_GESTURE_FLING_CANCEL: 124 case EVENT_TYPE_GESTURE_TAP_DOWN:
109 return BuildWebGestureEvent(event, device_pixel_ratio); 125 return BuildWebGestureEvent(event, device_pixel_ratio);
110 case EVENT_TYPE_UNKNOWN: 126 case EVENT_TYPE_UNKNOWN:
111 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN"; 127 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN";
112 } 128 }
113 129
114 return scoped_ptr<blink::WebInputEvent>(); 130 return scoped_ptr<blink::WebInputEvent>();
115 } 131 }
116 132
117 } // namespace mojo 133 } // namespace mojo
OLDNEW
« no previous file with comments | « sky/shell/org/domokit/sky/shell/GestureProvider.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698