| 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 69449fb5db4c006a4e69bc9a574e69eeb8c9a6d1..0c58b69166ca000b821991375bf83e20b8f5cb27 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -886,6 +886,20 @@ jboolean ContentViewCoreImpl::OnTouchEvent(JNIEnv* env,
|
| if (!rwhv)
|
| return false;
|
|
|
| + MotionEventAndroid::Pointer pointer0(pointer_id_0,
|
| + pos_x_0,
|
| + pos_y_0,
|
| + touch_major_0,
|
| + touch_minor_0,
|
| + orientation_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,
|
| + android_tool_type_1);
|
| MotionEventAndroid event(1.f / dpi_scale(),
|
| env,
|
| motion_event,
|
| @@ -894,24 +908,12 @@ jboolean ContentViewCoreImpl::OnTouchEvent(JNIEnv* env,
|
| pointer_count,
|
| history_size,
|
| action_index,
|
| - pos_x_0,
|
| - pos_y_0,
|
| - pos_x_1,
|
| - pos_y_1,
|
| - pointer_id_0,
|
| - pointer_id_1,
|
| - touch_major_0,
|
| - touch_major_1,
|
| - touch_minor_0,
|
| - touch_minor_1,
|
| - orientation_0,
|
| - orientation_1,
|
| - raw_pos_x,
|
| - raw_pos_y,
|
| - android_tool_type_0,
|
| - android_tool_type_1,
|
| + raw_pos_x - pos_x_0,
|
| + raw_pos_y - pos_y_0,
|
| android_button_state,
|
| - android_meta_state);
|
| + android_meta_state,
|
| + pointer0,
|
| + pointer1);
|
|
|
| return is_touch_handle_event ? rwhv->OnTouchHandleEvent(event)
|
| : rwhv->OnTouchEvent(event);
|
|
|