| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "services/native_viewport/platform_viewport_android.h" | 5 #include "services/native_viewport/platform_viewport_android.h" |
| 6 | 6 |
| 7 #include <android/input.h> | 7 #include <android/input.h> |
| 8 #include <android/native_window_jni.h> | 8 #include <android/native_window_jni.h> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 jfloat v_wheel) { | 115 jfloat v_wheel) { |
| 116 mojo::EventPtr event(mojo::Event::New()); | 116 mojo::EventPtr event(mojo::Event::New()); |
| 117 event->action = MotionEventActionToEventType(masked_action); | 117 event->action = MotionEventActionToEventType(masked_action); |
| 118 if (event->action == mojo::EVENT_TYPE_UNKNOWN) | 118 if (event->action == mojo::EVENT_TYPE_UNKNOWN) |
| 119 return false; | 119 return false; |
| 120 | 120 |
| 121 event->pointer_data = mojo::PointerData::New(); | 121 event->pointer_data = mojo::PointerData::New(); |
| 122 event->pointer_data->pointer_id = pointer_id; | 122 event->pointer_data->pointer_id = pointer_id; |
| 123 event->pointer_data->x = x; | 123 event->pointer_data->x = x; |
| 124 event->pointer_data->y = y; | 124 event->pointer_data->y = y; |
| 125 event->pointer_data->screen_x = x; |
| 126 event->pointer_data->screen_y = y; |
| 125 event->pointer_data->pressure = pressure; | 127 event->pointer_data->pressure = pressure; |
| 126 event->pointer_data->radius_major = touch_major; | 128 event->pointer_data->radius_major = touch_major; |
| 127 event->pointer_data->radius_minor = touch_minor; | 129 event->pointer_data->radius_minor = touch_minor; |
| 128 event->pointer_data->orientation = orientation; | 130 event->pointer_data->orientation = orientation; |
| 129 event->pointer_data->horizontal_wheel = h_wheel; | 131 event->pointer_data->horizontal_wheel = h_wheel; |
| 130 event->pointer_data->vertical_wheel = v_wheel; | 132 event->pointer_data->vertical_wheel = v_wheel; |
| 131 delegate_->OnEvent(event.Pass()); | 133 delegate_->OnEvent(event.Pass()); |
| 132 | 134 |
| 133 return true; | 135 return true; |
| 134 } | 136 } |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 //////////////////////////////////////////////////////////////////////////////// | 198 //////////////////////////////////////////////////////////////////////////////// |
| 197 // PlatformViewport, public: | 199 // PlatformViewport, public: |
| 198 | 200 |
| 199 // static | 201 // static |
| 200 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { | 202 scoped_ptr<PlatformViewport> PlatformViewport::Create(Delegate* delegate) { |
| 201 return scoped_ptr<PlatformViewport>( | 203 return scoped_ptr<PlatformViewport>( |
| 202 new PlatformViewportAndroid(delegate)).Pass(); | 204 new PlatformViewportAndroid(delegate)).Pass(); |
| 203 } | 205 } |
| 204 | 206 |
| 205 } // namespace native_viewport | 207 } // namespace native_viewport |
| OLD | NEW |