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

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

Issue 1019023003: Improve Material ink effects (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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 web_event->type = blink::WebInputEvent::GestureTap; 89 web_event->type = blink::WebInputEvent::GestureTap;
90 break; 90 break;
91 case EVENT_TYPE_GESTURE_TAP_DOWN: 91 case EVENT_TYPE_GESTURE_TAP_DOWN:
92 web_event->type = blink::WebInputEvent::GestureTapDown; 92 web_event->type = blink::WebInputEvent::GestureTapDown;
93 break; 93 break;
94 default: 94 default:
95 break; 95 break;
96 } 96 }
97 97
98 if (event->gesture_data) { 98 if (event->gesture_data) {
99 web_event->primaryPointer = event->gesture_data->primary_pointer;
99 web_event->x = event->gesture_data->x / device_pixel_ratio; 100 web_event->x = event->gesture_data->x / device_pixel_ratio;
100 web_event->y = event->gesture_data->y / device_pixel_ratio; 101 web_event->y = event->gesture_data->y / device_pixel_ratio;
101 } 102 }
102 103
103 return web_event.Pass(); 104 return web_event.Pass();
104 } 105 }
105 106
106 } // namespace 107 } // namespace
107 108
108 scoped_ptr<blink::WebInputEvent> ConvertEvent(const InputEventPtr& event, 109 scoped_ptr<blink::WebInputEvent> ConvertEvent(const InputEventPtr& event,
(...skipping 15 matching lines...) Expand all
124 case EVENT_TYPE_GESTURE_TAP_DOWN: 125 case EVENT_TYPE_GESTURE_TAP_DOWN:
125 return BuildWebGestureEvent(event, device_pixel_ratio); 126 return BuildWebGestureEvent(event, device_pixel_ratio);
126 case EVENT_TYPE_UNKNOWN: 127 case EVENT_TYPE_UNKNOWN:
127 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN"; 128 NOTIMPLEMENTED() << "ConvertEvent received unexpected EVENT_TYPE_UNKNOWN";
128 } 129 }
129 130
130 return scoped_ptr<blink::WebInputEvent>(); 131 return scoped_ptr<blink::WebInputEvent>();
131 } 132 }
132 133
133 } // namespace mojo 134 } // namespace mojo
OLDNEW
« sky/engine/core/events/GestureEvent.h ('K') | « 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