Chromium Code Reviews| 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 d424789e1e996ffea1541dfae1847f0acafc2361..1c0bf290cf14290ad7715552481f531ffaf40c3a 100644 |
| --- a/content/browser/android/content_view_core_impl.h |
| +++ b/content/browser/android/content_view_core_impl.h |
| @@ -128,12 +128,19 @@ class ContentViewCoreImpl : public ContentViewCore, |
| jint android_button_state, |
| jint android_meta_state, |
| jboolean is_touch_handle_event); |
| - jboolean SendMouseMoveEvent(JNIEnv* env, |
| - const base::android::JavaParamRef<jobject>& obj, |
| - jlong time_ms, |
| - jfloat x, |
| - jfloat y, |
| - jint tool_type); |
| + jboolean SendMouseEvent(JNIEnv* env, |
| + const base::android::JavaParamRef<jobject>& obj, |
| + jlong time_ms, |
| + jint android_action, |
| + jfloat x, |
| + jfloat y, |
| + jint pointer_id, |
| + jfloat pressure, |
| + jfloat orientation, |
| + jfloat tilt, |
| + jint android_button_state, |
| + jint android_meta_state, |
| + jint tool_type); |
| jboolean SendMouseWheelEvent(JNIEnv* env, |
| const base::android::JavaParamRef<jobject>& obj, |
| jlong time_ms, |
| @@ -472,6 +479,9 @@ class ContentViewCoreImpl : public ContentViewCore, |
| bool accessibility_enabled_; |
| + // The buttons currently depressed, see MotionEvent.getButtonState(). |
| + int button_state_; |
|
aelias_OOO_until_Jul13
2016/10/20 23:26:29
FWIW, this state doesn't really belong here, altho
mustaq
2016/10/21 19:19:08
The latest patch is after a rebase. I have also ad
mustaq
2016/10/26 17:45:09
Discovered today that my last patch was unusable f
|
| + |
| // Manages injecting Java objects. |
| scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_; |