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

Unified Diff: ui/base/event.cc

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/base/event.h ('k') | ui/base/gestures/gesture_point.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/event.cc
diff --git a/ui/base/event.cc b/ui/base/event.cc
index b25c09aa32ab1296af1e04e7780146fb9f67a44b..8a57e70ae7cf41d017b53816ee62914e0003803d 100644
--- a/ui/base/event.cc
+++ b/ui/base/event.cc
@@ -224,7 +224,7 @@ void MouseEvent::SetClickCount(int click_count) {
MouseEvent::MouseEvent(const MouseEvent& model) : LocatedEvent(model) {
}
-TouchEventImpl::TouchEventImpl(const base::NativeEvent& native_event)
+TouchEvent::TouchEvent(const base::NativeEvent& native_event)
: LocatedEvent(native_event),
touch_id_(ui::GetTouchId(native_event)),
radius_x_(GetTouchRadiusX(native_event)),
@@ -233,7 +233,7 @@ TouchEventImpl::TouchEventImpl(const base::NativeEvent& native_event)
force_(GetTouchForce(native_event)) {
}
-TouchEventImpl::TouchEventImpl(EventType type,
+TouchEvent::TouchEvent(EventType type,
const gfx::Point& location,
int touch_id,
base::TimeDelta time_stamp)
@@ -246,10 +246,10 @@ TouchEventImpl::TouchEventImpl(EventType type,
set_time_stamp(time_stamp);
}
-TouchEventImpl::~TouchEventImpl() {
+TouchEvent::~TouchEvent() {
}
-void TouchEventImpl::UpdateForRootTransform(const Transform& root_transform) {
+void TouchEvent::UpdateForRootTransform(const Transform& root_transform) {
LocatedEvent::UpdateForRootTransform(root_transform);
gfx::Point3f scale;
InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
@@ -259,42 +259,6 @@ void TouchEventImpl::UpdateForRootTransform(const Transform& root_transform) {
radius_y_ /= scale.y();
}
-EventType TouchEventImpl::GetEventType() const {
- return type();
-}
-
-gfx::Point TouchEventImpl::GetLocation() const {
- return location();
-}
-
-int TouchEventImpl::GetTouchId() const {
- return touch_id_;
-}
-
-int TouchEventImpl::GetEventFlags() const {
- return flags();
-}
-
-base::TimeDelta TouchEventImpl::GetTimestamp() const {
- return time_stamp();
-}
-
-float TouchEventImpl::RadiusX() const {
- return radius_x_;
-}
-
-float TouchEventImpl::RadiusY() const {
- return radius_y_;
-}
-
-float TouchEventImpl::RotationAngle() const {
- return rotation_angle_;
-}
-
-float TouchEventImpl::Force() const {
- return force_;
-}
-
KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
: Event(native_event,
EventTypeFromNative(native_event),
« no previous file with comments | « ui/base/event.h ('k') | ui/base/gestures/gesture_point.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698