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

Unified Diff: ui/views/view.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/gfx/transform_util_unittest.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.h
diff --git a/ui/views/view.h b/ui/views/view.h
index 78558c9b82a67fcd0af60b4f35ab5c9127d8aac5..65b22479530415e0ddf585b0f5f8bf8492c9cce3 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -37,6 +37,7 @@ namespace gfx {
class Canvas;
class Insets;
class Path;
+class Transform;
}
namespace ui {
@@ -46,7 +47,6 @@ class Layer;
class TextInputClient;
class Texture;
class ThemeProvider;
-class Transform;
}
#if defined(OS_WIN)
@@ -260,13 +260,13 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
// Methods for setting transformations for a view (e.g. rotation, scaling).
- const ui::Transform& GetTransform() const;
+ const gfx::Transform& GetTransform() const;
// Clipping parameters. Clipping is done relative to the view bounds.
void set_clip_insets(gfx::Insets clip_insets) { clip_insets_ = clip_insets; }
// Sets the transform to the supplied transform.
- void SetTransform(const ui::Transform& transform);
+ void SetTransform(const gfx::Transform& transform);
// Sets whether this view paints to a layer. A view paints to a layer if
// either of the following are true:
@@ -1231,7 +1231,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
// to this. Returns true if |ancestor| is found. If |ancestor| is not found,
// or NULL, |transform| is set to convert from root view coordinates to this.
bool GetTransformRelativeTo(const View* ancestor,
- ui::Transform* transform) const;
+ gfx::Transform* transform) const;
// Coordinate conversion -----------------------------------------------------
« no previous file with comments | « ui/gfx/transform_util_unittest.cc ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698