| Index: blimp/client/android/blimp_view.h
|
| diff --git a/blimp/client/android/blimp_view.h b/blimp/client/android/blimp_view.h
|
| index 97dc3ed8f0e81e384d3ff0f4694dde341a827950..8a1609cd1cb623676d0ada8f06d43f5526cd216c 100644
|
| --- a/blimp/client/android/blimp_view.h
|
| +++ b/blimp/client/android/blimp_view.h
|
| @@ -48,6 +48,34 @@ class BlimpView {
|
| void OnSurfaceCreated(JNIEnv* env, jobject jobj);
|
| void OnSurfaceDestroyed(JNIEnv* env, jobject jobj);
|
| void SetVisibility(JNIEnv* env, jobject jobj, jboolean visible);
|
| + jboolean OnTouchEvent(JNIEnv* env,
|
| + jobject obj,
|
| + jobject motion_event,
|
| + jlong time_ms,
|
| + jint android_action,
|
| + jint pointer_count,
|
| + jint history_size,
|
| + jint action_index,
|
| + jfloat pos_x_0,
|
| + jfloat pos_y_0,
|
| + jfloat pos_x_1,
|
| + jfloat pos_y_1,
|
| + jint pointer_id_0,
|
| + jint pointer_id_1,
|
| + jfloat touch_major_0,
|
| + jfloat touch_major_1,
|
| + jfloat touch_minor_0,
|
| + jfloat touch_minor_1,
|
| + jfloat orientation_0,
|
| + jfloat orientation_1,
|
| + jfloat tilt_0,
|
| + jfloat tilt_1,
|
| + jfloat raw_pos_x,
|
| + jfloat raw_pos_y,
|
| + jint android_tool_type_0,
|
| + jint android_tool_type_1,
|
| + jint android_button_state,
|
| + jint android_meta_state);
|
|
|
| private:
|
| virtual ~BlimpView();
|
| @@ -57,6 +85,8 @@ class BlimpView {
|
| // Reference to the Java object which owns this class.
|
| base::android::ScopedJavaGlobalRef<jobject> java_obj_;
|
|
|
| + const float device_scale_factor_;
|
| +
|
| scoped_ptr<BlimpCompositorAndroid> compositor_;
|
|
|
| // The format of the current surface owned by |compositor_|. See
|
|
|