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

Unified Diff: ui/events/android/motion_event_android.h

Issue 2708613002: Add EventForwarder for routing touch events (Closed)
Patch Set: base::Bind (doesn't compile yet) Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: ui/events/android/motion_event_android.h
diff --git a/ui/events/android/motion_event_android.h b/ui/events/android/motion_event_android.h
index 00fc4216c58d8240c61369afb3c15058af465232..45fc1988b6214f5893aa7eccca4ba09a8ec7f7bc 100644
--- a/ui/events/android/motion_event_android.h
+++ b/ui/events/android/motion_event_android.h
@@ -54,6 +54,7 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
jint pointer_count,
jint history_size,
jint action_index,
+ jint android_action_button,
jint android_button_state,
jint meta_state,
jfloat raw_offset_x_pixels,
@@ -62,6 +63,8 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
const Pointer* const pointer1);
~MotionEventAndroid() override;
+ MotionEventAndroid(const MotionEventAndroid& e, float x, float y);
+
// ui::MotionEvent methods.
uint32_t GetUniqueEventId() const override;
Action GetAction() const override;
@@ -91,11 +94,17 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
int GetButtonState() const override;
int GetFlags() const override;
+ int GetActionButton() const;
+ base::android::ScopedJavaLocalRef<jobject> GetJavaObject() const;
+
private:
struct CachedPointer;
float ToDips(float pixels) const;
CachedPointer FromAndroidPointer(const Pointer& pointer) const;
+ CachedPointer FromCachedPointer(const CachedPointer& pointer,
+ float x,
+ float y) const;
// Cache pointer coords, id's and major lengths for the most common
// touch-related scenarios, i.e., scrolling and pinching. This prevents
@@ -114,6 +123,7 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
const size_t cached_pointer_count_;
const size_t cached_history_size_;
const int cached_action_index_;
+ const int cached_action_button_;
const int cached_button_state_;
const int cached_flags_;
const gfx::Vector2dF cached_raw_position_offset_;

Powered by Google App Engine
This is Rietveld 408576698