blimp/client/core/contents/android/blimp_view.cc - Issue 2054193002: Android mouse events shouldn't appear as TouchEvents

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: blimp/client/core/contents/android/blimp_view.cc

Issue 2054193002: Android mouse events shouldn't appear as TouchEvents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added meta_state plumbing. Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | content/browser/android/content_view_core_impl.h » ('j') | content/browser/android/content_view_core_impl.h » ('J')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 #include "blimp/client/core/contents/android/blimp_view.h"	5 #include "blimp/client/core/contents/android/blimp_view.h"

6	6

7 #include "blimp/client/core/compositor/blimp_compositor_manager.h"	7 #include "blimp/client/core/compositor/blimp_compositor_manager.h"

8 #include "blimp/client/core/contents/blimp_contents_impl.h"	8 #include "blimp/client/core/contents/blimp_contents_impl.h"

9 #include "jni/BlimpView_jni.h"	9 #include "jni/BlimpView_jni.h"

10 #include "ui/android/window_android.h"	10 #include "ui/android/window_android.h"

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 ui::MotionEventAndroid::Pointer pointer0(	85 ui::MotionEventAndroid::Pointer pointer0(

86 pointer_id_0, pos_x_0, pos_y_0, touch_major_0, touch_minor_0,	86 pointer_id_0, pos_x_0, pos_y_0, touch_major_0, touch_minor_0,

87 orientation_0, tilt_0, android_tool_type_0);	87 orientation_0, tilt_0, android_tool_type_0);

88 ui::MotionEventAndroid::Pointer pointer1(	88 ui::MotionEventAndroid::Pointer pointer1(

89 pointer_id_1, pos_x_1, pos_y_1, touch_major_1, touch_minor_1,	89 pointer_id_1, pos_x_1, pos_y_1, touch_major_1, touch_minor_1,

90 orientation_1, tilt_1, android_tool_type_1);	90 orientation_1, tilt_1, android_tool_type_1);

91 ui::MotionEventAndroid event(	91 ui::MotionEventAndroid event(

92 1.f / device_scale_factor_dp_to_px, env, motion_event, time_ms,	92 1.f / device_scale_factor_dp_to_px, env, motion_event, time_ms,

93 android_action, pointer_count, history_size, action_index,	93 android_action, pointer_count, history_size, action_index,

94 android_button_state, android_meta_state, raw_pos_x - pos_x_0,	94 android_button_state, android_meta_state, raw_pos_x - pos_x_0,

95 raw_pos_y - pos_y_0, pointer0, pointer1);	95 raw_pos_y - pos_y_0, &pointer0, &pointer1);

96 return blimp_contents_view_->OnTouchEvent(event);	96 return blimp_contents_view_->OnTouchEvent(event);

97 }	97 }

98	98

99 } // namespace client	99 } // namespace client

100 } // namespace blimp	100 } // namespace blimp

OLD	NEW