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

Unified Diff: ui/aura/root_window.cc

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/aura/root_window.h ('k') | ui/aura/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 205da39e4c61971102d5d6a3e581ccb2d07d06cd..9cf2a7d8105e764ebf52bafd78b2a86fdd3ed04e 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -469,7 +469,7 @@ const RootWindow* RootWindow::GetRootWindow() const {
return this;
}
-void RootWindow::SetTransform(const ui::Transform& transform) {
+void RootWindow::SetTransform(const gfx::Transform& transform) {
Window::SetTransform(transform);
// If the layer is not animating, then we need to update the host size
@@ -835,7 +835,7 @@ bool RootWindow::OnHostMouseEvent(ui::MouseEvent* event) {
bool RootWindow::OnHostScrollEvent(ui::ScrollEvent* event) {
DispatchHeldMouseMove();
float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
+ gfx::Transform transform = layer()->transform();
transform.ConcatScale(scale, scale);
event->UpdateForRootTransform(transform);
@@ -879,7 +879,7 @@ bool RootWindow::OnHostTouchEvent(ui::TouchEvent* event) {
break;
}
float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
+ gfx::Transform transform = layer()->transform();
transform.ConcatScale(scale, scale);
event->UpdateForRootTransform(transform);
bool handled = false;
@@ -970,7 +970,7 @@ RootWindow* RootWindow::AsRootWindow() {
bool RootWindow::DispatchMouseEventImpl(ui::MouseEvent* event) {
float scale = ui::GetDeviceScaleFactor(layer());
- ui::Transform transform = layer()->transform();
+ gfx::Transform transform = layer()->transform();
transform.ConcatScale(scale, scale);
event->UpdateForRootTransform(transform);
Window* target = mouse_pressed_handler_ ?
@@ -1047,7 +1047,7 @@ void RootWindow::SynthesizeMouseMoveEvent() {
#if !defined(OS_WIN)
// Temporarily disabled for windows. See crbug.com/112222.
gfx::Point3f point(GetLastMouseLocationInRoot());
- ui::Transform transform = layer()->transform();
+ gfx::Transform transform = layer()->transform();
float scale = ui::GetDeviceScaleFactor(layer());
transform.ConcatScale(scale, scale);
transform.TransformPoint(point);
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698