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

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

Issue 2708613002: Add EventForwarder for routing touch events (Closed)
Patch Set: EventForwarder... 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
« no previous file with comments | « ui/android/view_client.cc ('k') | ui/events/android/motion_event_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..305fe6a53b9a95275ee1a996cff5f1d221735893 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;
+ std::unique_ptr<MotionEventAndroid> Offset(float x, float y) const;
+
// 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 OffsetCachedPointer(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_;
@@ -131,7 +141,9 @@ class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
// A unique identifier for the Android motion event.
const uint32_t unique_event_id_;
- DISALLOW_COPY_AND_ASSIGN(MotionEventAndroid);
+ // Disallow copy/assign.
+ MotionEventAndroid(const MotionEventAndroid& e); // private ctor
+ void operator=(const MotionEventAndroid&) = delete;
};
} // namespace content
« no previous file with comments | « ui/android/view_client.cc ('k') | ui/events/android/motion_event_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698