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

Side by Side Diff: content/browser/renderer_host/input/motion_event_android.h

Issue 212663010: Store the id of a contributing motion event in GestureEventData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Store motion_event_id, not touch_id. Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 20 matching lines...) Expand all
31 jfloat pos_y_0, 31 jfloat pos_y_0,
32 jfloat pos_x_1, 32 jfloat pos_x_1,
33 jfloat pos_y_1, 33 jfloat pos_y_1,
34 jint pointer_id_0, 34 jint pointer_id_0,
35 jint pointer_id_1, 35 jint pointer_id_1,
36 jfloat touch_major_0, 36 jfloat touch_major_0,
37 jfloat touch_major_1); 37 jfloat touch_major_1);
38 virtual ~MotionEventAndroid(); 38 virtual ~MotionEventAndroid();
39 39
40 // ui::MotionEvent methods. 40 // ui::MotionEvent methods.
41 virtual int GetId() const OVERRIDE;
41 virtual Action GetAction() const OVERRIDE; 42 virtual Action GetAction() const OVERRIDE;
42 virtual int GetActionIndex() const OVERRIDE; 43 virtual int GetActionIndex() const OVERRIDE;
43 virtual size_t GetPointerCount() const OVERRIDE; 44 virtual size_t GetPointerCount() const OVERRIDE;
44 virtual int GetPointerId(size_t pointer_index) const OVERRIDE; 45 virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
45 virtual float GetX(size_t pointer_index) const OVERRIDE; 46 virtual float GetX(size_t pointer_index) const OVERRIDE;
46 virtual float GetY(size_t pointer_index) const OVERRIDE; 47 virtual float GetY(size_t pointer_index) const OVERRIDE;
47 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; 48 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
48 virtual float GetPressure(size_t pointer_index) const OVERRIDE; 49 virtual float GetPressure(size_t pointer_index) const OVERRIDE;
49 virtual base::TimeTicks GetEventTime() const OVERRIDE; 50 virtual base::TimeTicks GetEventTime() const OVERRIDE;
50 virtual size_t GetHistorySize() const OVERRIDE; 51 virtual size_t GetHistorySize() const OVERRIDE;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 float cached_touch_majors_[MAX_POINTERS_TO_CACHE]; 104 float cached_touch_majors_[MAX_POINTERS_TO_CACHE];
104 105
105 // Whether |event_| should be recycled on destruction. This will only be true 106 // Whether |event_| should be recycled on destruction. This will only be true
106 // for those events generated via |Obtain(...)|. 107 // for those events generated via |Obtain(...)|.
107 bool should_recycle_; 108 bool should_recycle_;
108 }; 109 };
109 110
110 } // namespace content 111 } // namespace content
111 112
112 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_ 113 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698