summaryrefslogtreecommitdiffstats
path: root/ui/events/gesture_event_details.h
diff options
context:
space:
mode:
authorhoro <horo@chromium.org>2014-09-16 20:49:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-17 03:49:31 +0000
commitf0003ece045e6e30ff3d70be4ea818c365b08cf6 (patch)
tree400db20744e6a5eb06c3feae74e6211606e00170 /ui/events/gesture_event_details.h
parent366f7a7500ef5951b17bb8aeb087fcd90559e347 (diff)
downloadchromium_src-f0003ece045e6e30ff3d70be4ea818c365b08cf6.zip
chromium_src-f0003ece045e6e30ff3d70be4ea818c365b08cf6.tar.gz
chromium_src-f0003ece045e6e30ff3d70be4ea818c365b08cf6.tar.bz2
Revert of Clean up GestureEventDetails constructors and fix unit tests (patchset #1 id:20001 of https://codereview.chromium.org/573963005/)
Reason for revert: This broke TouchEditableImplAuraTest.TouchSelectionOnLongPressTest. [24874:24874:0916/151803:584385367:FATAL:gesture_event_details.cc(54)] Check failed: false. Invalid event type for constructor: 32 http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=undefined&tests=TouchEditableImplAuraTest.TouchSelectionOnLongPressTest&testType=content_browsertests http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=undefined&tests=TouchEditableImplAuraTest.TouchSelectionOnLongPressTest&testType=content_browsertests Original issue's description: > Clean up GestureEventDetails constructors and fix unit tests. > > A new version of Issue 565583005: Clean up GestureEventDetails > constructors > https://codereview.chromium.org/565583005/ > > BUG=350942 > > TBR=tdresser@chromium.org, jdduke@chromium.org, sadrul@chromium.org > > Committed: https://crrev.com/874611d5ab5b879648682c1ea41062bebc9c95e5 > Cr-Commit-Position: refs/heads/master@{#295144} TBR=sky@chromium.org,lanwei@chromium.org NOTREECHECKS=true NOTRY=true BUG=350942 Review URL: https://codereview.chromium.org/577833003 Cr-Commit-Position: refs/heads/master@{#295223}
Diffstat (limited to 'ui/events/gesture_event_details.h')
-rw-r--r--ui/events/gesture_event_details.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/ui/events/gesture_event_details.h b/ui/events/gesture_event_details.h
index da7a60b..58d28fa 100644
--- a/ui/events/gesture_event_details.h
+++ b/ui/events/gesture_event_details.h
@@ -16,7 +16,6 @@ namespace ui {
struct EVENTS_BASE_EXPORT GestureEventDetails {
public:
GestureEventDetails();
- explicit GestureEventDetails(EventType type);
GestureEventDetails(EventType type, float delta_x, float delta_y);
EventType type() const { return type_; }
@@ -124,12 +123,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
data.tap_count = tap_count;
}
- void set_scale(float scale) {
- DCHECK_GE(scale, 0.0f);
- DCHECK_EQ(type_, ET_GESTURE_PINCH_UPDATE);
- data.scale = scale;
- }
-
private:
EventType type_;
union Details {