Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1075)

Side by Side Diff: content/browser/android/content_view_core_impl.h

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, 2 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 jfloat orientation_1, 121 jfloat orientation_1,
122 jfloat tilt_0, 122 jfloat tilt_0,
123 jfloat tilt_1, 123 jfloat tilt_1,
124 jfloat raw_pos_x, 124 jfloat raw_pos_x,
125 jfloat raw_pos_y, 125 jfloat raw_pos_y,
126 jint android_tool_type_0, 126 jint android_tool_type_0,
127 jint android_tool_type_1, 127 jint android_tool_type_1,
128 jint android_button_state, 128 jint android_button_state,
129 jint android_meta_state, 129 jint android_meta_state,
130 jboolean is_touch_handle_event); 130 jboolean is_touch_handle_event);
131 jboolean SendMouseMoveEvent(JNIEnv* env, 131 jboolean SendMouseEvent(JNIEnv* env,
132 const base::android::JavaParamRef<jobject>& obj, 132 const base::android::JavaParamRef<jobject>& obj,
133 jlong time_ms, 133 jlong time_ms,
134 jfloat x, 134 jint android_action,
135 jfloat y, 135 jfloat x,
136 jint tool_type); 136 jfloat y,
137 jint pointer_id,
138 jfloat pressure,
139 jfloat orientation,
140 jfloat tilt,
141 jint android_button_state,
142 jint android_meta_state,
143 jint tool_type);
137 jboolean SendMouseWheelEvent(JNIEnv* env, 144 jboolean SendMouseWheelEvent(JNIEnv* env,
138 const base::android::JavaParamRef<jobject>& obj, 145 const base::android::JavaParamRef<jobject>& obj,
139 jlong time_ms, 146 jlong time_ms,
140 jfloat x, 147 jfloat x,
141 jfloat y, 148 jfloat y,
142 jfloat ticks_x, 149 jfloat ticks_x,
143 jfloat ticks_y, 150 jfloat ticks_y,
144 jfloat pixels_per_tick); 151 jfloat pixels_per_tick);
145 void ScrollBegin(JNIEnv* env, 152 void ScrollBegin(JNIEnv* env,
146 const base::android::JavaParamRef<jobject>& obj, 153 const base::android::JavaParamRef<jobject>& obj,
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 472
466 // Observer to notify of lifecyle changes. 473 // Observer to notify of lifecyle changes.
467 base::ObserverList<ContentViewCoreImplObserver> observer_list_; 474 base::ObserverList<ContentViewCoreImplObserver> observer_list_;
468 475
469 // The cache of device's current orientation set from Java side, this value 476 // The cache of device's current orientation set from Java side, this value
470 // will be sent to Renderer once it is ready. 477 // will be sent to Renderer once it is ready.
471 int device_orientation_; 478 int device_orientation_;
472 479
473 bool accessibility_enabled_; 480 bool accessibility_enabled_;
474 481
482 // The buttons currently depressed, see MotionEvent.getButtonState().
483 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
484
475 // Manages injecting Java objects. 485 // Manages injecting Java objects.
476 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_; 486 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
477 487
478 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 488 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
479 }; 489 };
480 490
481 bool RegisterContentViewCore(JNIEnv* env); 491 bool RegisterContentViewCore(JNIEnv* env);
482 492
483 } // namespace content 493 } // namespace content
484 494
485 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 495 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698