| 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 #ifndef SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ | 5 #ifndef SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ |
| 6 #define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ | 6 #define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/android/jni_weak_ref.h" | 8 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 virtual ~PlatformViewportAndroid(); | 31 virtual ~PlatformViewportAndroid(); |
| 32 | 32 |
| 33 void Destroy(JNIEnv* env, jobject obj); | 33 void Destroy(JNIEnv* env, jobject obj); |
| 34 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); | 34 void SurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); |
| 35 void SurfaceDestroyed(JNIEnv* env, jobject obj); | 35 void SurfaceDestroyed(JNIEnv* env, jobject obj); |
| 36 void SurfaceSetSize(JNIEnv* env, | 36 void SurfaceSetSize(JNIEnv* env, |
| 37 jobject obj, | 37 jobject obj, |
| 38 jint width, | 38 jint width, |
| 39 jint height, | 39 jint height, |
| 40 jfloat density); | 40 jfloat density); |
| 41 bool TouchEvent(JNIEnv* env, jobject obj, jint pointer_id, jint action, | 41 bool TouchEvent(JNIEnv* env, |
| 42 jfloat x, jfloat y, jlong time_ms); | 42 jobject obj, |
| 43 jlong time_ms, |
| 44 jint masked_action, |
| 45 jint pointer_id, |
| 46 jfloat x, |
| 47 jfloat y, |
| 48 jfloat pressure, |
| 49 jfloat touch_major, |
| 50 jfloat touch_minor, |
| 51 jfloat orientation, |
| 52 jfloat h_wheel, |
| 53 jfloat v_wheel); |
| 43 bool KeyEvent(JNIEnv* env, | 54 bool KeyEvent(JNIEnv* env, |
| 44 jobject obj, | 55 jobject obj, |
| 45 bool pressed, | 56 bool pressed, |
| 46 jint key_code, | 57 jint key_code, |
| 47 jint unicode_character); | 58 jint unicode_character); |
| 48 | 59 |
| 49 private: | 60 private: |
| 50 // Overridden from PlatformViewport: | 61 // Overridden from PlatformViewport: |
| 51 virtual void Init(const gfx::Rect& bounds) override; | 62 virtual void Init(const gfx::Rect& bounds) override; |
| 52 virtual void Show() override; | 63 virtual void Show() override; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 63 ui::SequentialIDGenerator id_generator_; | 74 ui::SequentialIDGenerator id_generator_; |
| 64 | 75 |
| 65 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_; | 76 base::WeakPtrFactory<PlatformViewportAndroid> weak_factory_; |
| 66 | 77 |
| 67 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid); | 78 DISALLOW_COPY_AND_ASSIGN(PlatformViewportAndroid); |
| 68 }; | 79 }; |
| 69 | 80 |
| 70 } // namespace native_viewport | 81 } // namespace native_viewport |
| 71 | 82 |
| 72 #endif // SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ | 83 #endif // SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_ |
| OLD | NEW |