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

Unified Diff: ui/base/events/event.h

Issue 11145005: Migrate ui::Transform to gfx::Transform (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Hopefully should work this time Created 8 years, 2 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/animation/tween.cc ('k') | ui/base/events/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event.h
diff --git a/ui/base/events/event.h b/ui/base/events/event.h
index 2b9d340d724bc37ed0425cc661b14103894effa8..3293586622443999ee9b29da348a012c64f46fa0 100644
--- a/ui/base/events/event.h
+++ b/ui/base/events/event.h
@@ -17,8 +17,11 @@
#include "ui/base/ui_export.h"
#include "ui/gfx/point.h"
-namespace ui {
+namespace gfx {
class Transform;
+}
+
+namespace ui {
class EventTarget;
class UI_EXPORT Event {
@@ -220,7 +223,7 @@ class UI_EXPORT LocatedEvent : public Event {
// Applies |root_transform| to the event.
// This is applied to both |location_| and |root_location_|.
- virtual void UpdateForRootTransform(const Transform& root_transform);
+ virtual void UpdateForRootTransform(const gfx::Transform& root_transform);
template <class T> void ConvertLocationToTarget(T* source, T* target) {
if (target && target != source)
@@ -426,7 +429,8 @@ class UI_EXPORT TouchEvent : public LocatedEvent {
void set_radius_y(const float r) { radius_y_ = r; }
// Overridden from LocatedEvent.
- virtual void UpdateForRootTransform(const Transform& root_transform) OVERRIDE;
+ virtual void UpdateForRootTransform(
+ const gfx::Transform& root_transform) OVERRIDE;
protected:
void set_radius(float radius_x, float radius_y) {
« no previous file with comments | « ui/base/animation/tween.cc ('k') | ui/base/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698