| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index 41f7930b93f150cfbf46dc8d51038df98b43191b..38cc1b0d5ce741a580de4426f9c2812ad1580e9e 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -894,78 +894,6 @@ void ContentViewCoreImpl::SendOrientationChangeEvent(
|
| }
|
| }
|
|
|
| -jboolean ContentViewCoreImpl::OnTouchEvent(
|
| - JNIEnv* env,
|
| - const JavaParamRef<jobject>& obj,
|
| - const 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) {
|
| - RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
|
| - // Avoid synthesizing a touch event if it cannot be forwarded.
|
| - if (!rwhv)
|
| - return false;
|
| -
|
| - MotionEventAndroid::Pointer pointer0(pointer_id_0,
|
| - pos_x_0,
|
| - pos_y_0,
|
| - touch_major_0,
|
| - touch_minor_0,
|
| - orientation_0,
|
| - tilt_0,
|
| - android_tool_type_0);
|
| - MotionEventAndroid::Pointer pointer1(pointer_id_1,
|
| - pos_x_1,
|
| - pos_y_1,
|
| - touch_major_1,
|
| - touch_minor_1,
|
| - orientation_1,
|
| - tilt_1,
|
| - android_tool_type_1);
|
| - MotionEventAndroid event(1.f / dpi_scale(),
|
| - env,
|
| - motion_event,
|
| - time_ms,
|
| - android_action,
|
| - pointer_count,
|
| - history_size,
|
| - action_index,
|
| - android_button_state,
|
| - android_meta_state,
|
| - raw_pos_x - pos_x_0,
|
| - raw_pos_y - pos_y_0,
|
| - &pointer0,
|
| - &pointer1);
|
| -
|
| - RecordToolTypeForActionDown(event);
|
| -
|
| - return is_touch_handle_event ? rwhv->OnTouchHandleEvent(event)
|
| - : rwhv->OnTouchEvent(event);
|
| -}
|
| -
|
| jboolean ContentViewCoreImpl::SendMouseEvent(
|
| JNIEnv* env,
|
| const JavaParamRef<jobject>& obj,
|
|
|