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

Side by Side Diff: ui/events/event.h

Issue 1026573002: Prevent TouchEvent Crash on X (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | ui/events/event.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_EVENTS_EVENT_H_ 5 #ifndef UI_EVENTS_EVENT_H_
6 #define UI_EVENTS_EVENT_H_ 6 #define UI_EVENTS_EVENT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/event_types.h" 10 #include "base/event_types.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 TouchEvent(EventType type, 508 TouchEvent(EventType type,
509 const gfx::PointF& location, 509 const gfx::PointF& location,
510 int flags, 510 int flags,
511 int touch_id, 511 int touch_id,
512 base::TimeDelta timestamp, 512 base::TimeDelta timestamp,
513 float radius_x, 513 float radius_x,
514 float radius_y, 514 float radius_y,
515 float angle, 515 float angle,
516 float force); 516 float force);
517 517
518 TouchEvent(const TouchEvent& copy);
519
518 ~TouchEvent() override; 520 ~TouchEvent() override;
519 521
520 // The id of the pointer this event modifies. 522 // The id of the pointer this event modifies.
521 int touch_id() const { return touch_id_; } 523 int touch_id() const { return touch_id_; }
522 // A unique identifier for this event. 524 // A unique identifier for this event.
523 uint64 unique_event_id() const { return unique_event_id_; } 525 uint64 unique_event_id() const { return unique_event_id_; }
524 // If we aren't provided with a radius on one axis, use the 526 // If we aren't provided with a radius on one axis, use the
525 // information from the other axis. 527 // information from the other axis.
526 float radius_x() const { return radius_x_ > 0 ? radius_x_ : radius_y_; } 528 float radius_x() const { return radius_x_ > 0 ? radius_x_ : radius_y_; }
527 float radius_y() const { return radius_y_ > 0 ? radius_y_ : radius_x_; } 529 float radius_y() const { return radius_y_ > 0 ? radius_y_ : radius_x_; }
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 883
882 const GestureEventDetails& details() const { return details_; } 884 const GestureEventDetails& details() const { return details_; }
883 885
884 private: 886 private:
885 GestureEventDetails details_; 887 GestureEventDetails details_;
886 }; 888 };
887 889
888 } // namespace ui 890 } // namespace ui
889 891
890 #endif // UI_EVENTS_EVENT_H_ 892 #endif // UI_EVENTS_EVENT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698