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

Unified Diff: ui/events/event.h

Issue 1300803003: Drop ui::TouchEvent shims for radius_{x,y} and force (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 | « mojo/converters/input_events/input_events_type_converters.cc ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event.h
diff --git a/ui/events/event.h b/ui/events/event.h
index 0667824d34bf3b97c01aa6e0d50f3d9ef01006b6..5e9f8a25d9015bdd2512aa3730e11d6534cf0db1 100644
--- a/ui/events/event.h
+++ b/ui/events/event.h
@@ -463,7 +463,7 @@ class EVENTS_EXPORT MouseEvent : public LocatedEvent {
void set_changed_button_flags(int flags) { changed_button_flags_ = flags; }
// Event details common to MouseEvent and TouchEvent.
- const PointerDetails& pointer_details() { return pointer_details_; }
+ const PointerDetails& pointer_details() const { return pointer_details_; }
void set_pointer_details(const PointerDetails& details) {
pointer_details_ = details;
}
@@ -579,11 +579,6 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
// A unique identifier for this event.
uint32 unique_event_id() const { return unique_event_id_; }
- // TODO(robert.bradford): Drop these shims.
- float radius_x() const { return pointer_details_.radius_x(); }
- float radius_y() const { return pointer_details_.radius_y(); }
- float force() const { return pointer_details_.force(); }
-
float rotation_angle() const { return rotation_angle_; }
void set_may_cause_scrolling(bool causes) { may_cause_scrolling_ = causes; }
@@ -611,7 +606,7 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
}
// Event details common to MouseEvent and TouchEvent.
- const PointerDetails& pointer_details() { return pointer_details_; }
+ const PointerDetails& pointer_details() const { return pointer_details_; }
private:
// Adjusts rotation_angle_ to within the acceptable range.
« no previous file with comments | « mojo/converters/input_events/input_events_type_converters.cc ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698