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

Unified Diff: ui/base/event.h

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot Created 8 years, 4 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/aura/window_unittest.cc ('k') | ui/base/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/event.h
diff --git a/ui/base/event.h b/ui/base/event.h
index 86d548864180bcb168f48cef0b064d3a27f216c3..81de5c3e1995de808e387dee4f53ee30cc7949cc 100644
--- a/ui/base/event.h
+++ b/ui/base/event.h
@@ -192,17 +192,15 @@ class UI_EXPORT MouseEvent : public LocatedEvent {
static int GetRepeatCount(const MouseEvent& click_event);
};
-// TODO(beng): rename to TouchEvent after conversion is complete.
-class UI_EXPORT TouchEventImpl : public LocatedEvent,
- public TouchEvent {
+class UI_EXPORT TouchEvent : public LocatedEvent {
public:
- explicit TouchEventImpl(const base::NativeEvent& native_event);
+ explicit TouchEvent(const base::NativeEvent& native_event);
- // Create a new TouchEventImpl which is identical to the provided model.
+ // Create a new TouchEvent which is identical to the provided model.
// If source / target windows are provided, the model location will be
// converted from |source| coordinate system to |target| coordinate system.
template <class T>
- TouchEventImpl(const TouchEventImpl& model, T* source, T* target)
+ TouchEvent(const TouchEvent& model, T* source, T* target)
: LocatedEvent(model, source, target),
touch_id_(model.touch_id_),
radius_x_(model.radius_x_),
@@ -211,12 +209,12 @@ class UI_EXPORT TouchEventImpl : public LocatedEvent,
force_(model.force_) {
}
- TouchEventImpl(EventType type,
+ TouchEvent(EventType type,
const gfx::Point& root_location,
int touch_id,
base::TimeDelta time_stamp);
- virtual ~TouchEventImpl();
+ virtual ~TouchEvent();
int touch_id() const { return touch_id_; }
float radius_x() const { return radius_x_; }
@@ -231,16 +229,29 @@ class UI_EXPORT TouchEventImpl : public LocatedEvent,
// Overridden from LocatedEvent.
virtual void UpdateForRootTransform(const Transform& root_transform) OVERRIDE;
- // Overridden from TouchEvent.
- virtual EventType GetEventType() const OVERRIDE;
- virtual gfx::Point GetLocation() const OVERRIDE;
- virtual int GetTouchId() const OVERRIDE;
- virtual int GetEventFlags() const OVERRIDE;
- virtual base::TimeDelta GetTimestamp() const OVERRIDE;
- virtual float RadiusX() const OVERRIDE;
- virtual float RadiusY() const OVERRIDE;
- virtual float RotationAngle() const OVERRIDE;
- virtual float Force() const OVERRIDE;
+ protected:
+ void set_radius(float radius_x, float radius_y) {
+ radius_x_ = radius_x;
+ radius_y_ = radius_y;
+ }
+
+ void set_rotation_angle(float rotation_angle) {
+ rotation_angle_ = rotation_angle;
+ }
+
+ void set_force(float force) { force_ = force; }
+
+ protected:
+ void set_radius(float radius_x, float radius_y) {
+ radius_x_ = radius_x;
+ radius_y_ = radius_y;
+ }
+
+ void set_rotation_angle(float rotation_angle) {
+ rotation_angle_ = rotation_angle;
+ }
+
+ void set_force(float force) { force_ = force; }
private:
// The identity (typically finger) of the touch starting at 0 and incrementing
@@ -254,12 +265,12 @@ class UI_EXPORT TouchEventImpl : public LocatedEvent,
float radius_y_;
// Angle of the major axis away from the X axis. Default 0.0.
- const float rotation_angle_;
+ float rotation_angle_;
// Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
- const float force_;
+ float force_;
- DISALLOW_COPY_AND_ASSIGN(TouchEventImpl);
+ DISALLOW_COPY_AND_ASSIGN(TouchEvent);
};
class UI_EXPORT KeyEvent : public Event {
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/base/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698