| Index: content/browser/android/content_view_core_impl.h
|
| diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
|
| index f76b0413556d3efdd346ce064c5b38cc8f08391e..4629b77d03f3685404b34ee32994b8843f180818 100644
|
| --- a/content/browser/android/content_view_core_impl.h
|
| +++ b/content/browser/android/content_view_core_impl.h
|
| @@ -71,9 +71,10 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
|
|
| - void UpdateWindowAndroid(JNIEnv* env,
|
| - const base::android::JavaParamRef<jobject>& obj,
|
| - jlong window_android);
|
| + void UpdateViewRoot(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj,
|
| + jlong view_root_ptr);
|
| void OnJavaContentViewCoreDestroyed(
|
| JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
| @@ -90,36 +91,6 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj,
|
| jint orientation);
|
| - jboolean OnTouchEvent(
|
| - JNIEnv* env,
|
| - const base::android::JavaParamRef<jobject>& obj,
|
| - const base::android::JavaParamRef<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,
|
| - jboolean is_touch_handle_event);
|
| jboolean SendMouseEvent(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj,
|
| jlong time_ms,
|
| @@ -283,6 +254,16 @@ class ContentViewCoreImpl : public ContentViewCore,
|
| const base::android::JavaParamRef<jobjectArray>& j_mimeTypes,
|
| const base::android::JavaParamRef<jstring>& j_content);
|
|
|
| + void MoveToFrontInViewHierarchy(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& jobj);
|
| + void UpdateViewBounds(
|
| + JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& jobj,
|
| + int x,
|
| + int y,
|
| + int width,
|
| + int height);
|
| jint GetCurrentRenderProcessId(
|
| JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
|
|