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

Side by Side Diff: content/browser/renderer_host/input/motion_event_web.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_WEB_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
7 7
8 #include "third_party/WebKit/public/web/WebInputEvent.h" 8 #include "third_party/WebKit/public/web/WebInputEvent.h"
9 #include "ui/events/gesture_detection/motion_event.h" 9 #include "ui/events/gesture_detection/motion_event.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 // Implementation of ui::MotionEvent wrapping a WebTouchEvent. 13 // Implementation of ui::MotionEvent wrapping a WebTouchEvent.
14 class MotionEventWeb : public ui::MotionEvent { 14 class MotionEventWeb : public ui::MotionEvent {
15 public: 15 public:
16 explicit MotionEventWeb(const blink::WebTouchEvent& event); 16 explicit MotionEventWeb(const blink::WebTouchEvent& event);
17 virtual ~MotionEventWeb(); 17 virtual ~MotionEventWeb();
18 18
19 // ui::MotionEvent 19 // ui::MotionEvent
20 virtual int GetId() const OVERRIDE;
20 virtual Action GetAction() const OVERRIDE; 21 virtual Action GetAction() const OVERRIDE;
21 virtual int GetActionIndex() const OVERRIDE; 22 virtual int GetActionIndex() const OVERRIDE;
22 virtual size_t GetPointerCount() const OVERRIDE; 23 virtual size_t GetPointerCount() const OVERRIDE;
23 virtual int GetPointerId(size_t pointer_index) const OVERRIDE; 24 virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
24 virtual float GetX(size_t pointer_index) const OVERRIDE; 25 virtual float GetX(size_t pointer_index) const OVERRIDE;
25 virtual float GetY(size_t pointer_index) const OVERRIDE; 26 virtual float GetY(size_t pointer_index) const OVERRIDE;
26 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE; 27 virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
27 virtual float GetPressure(size_t pointer_index) const OVERRIDE; 28 virtual float GetPressure(size_t pointer_index) const OVERRIDE;
28 virtual base::TimeTicks GetEventTime() const OVERRIDE; 29 virtual base::TimeTicks GetEventTime() const OVERRIDE;
29 virtual size_t GetHistorySize() const OVERRIDE; 30 virtual size_t GetHistorySize() const OVERRIDE;
(...skipping 15 matching lines...) Expand all
45 blink::WebTouchEvent event_; 46 blink::WebTouchEvent event_;
46 Action cached_action_; 47 Action cached_action_;
47 int cached_action_index_; 48 int cached_action_index_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(MotionEventWeb); 50 DISALLOW_COPY_AND_ASSIGN(MotionEventWeb);
50 }; 51 };
51 52
52 } // namespace content 53 } // namespace content
53 54
54 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_ 55 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_WEB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698