| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 986929b0b1bfb94f9103a4279ff5e30063144251..be2257c253decefb90e96a10ac1c01525e7300e3 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -370,7 +370,7 @@ TEST_F(WindowTest, MoveCursorToWithTransformRootWindow) {
|
| transform.Translate(100.0, 100.0);
|
| transform.Rotate(90.0);
|
| transform.Scale(2.0, 5.0);
|
| - host()->SetTransform(transform);
|
| + host()->SetRootTransform(transform);
|
| host()->MoveCursorTo(gfx::Point(10, 10));
|
| #if !defined(OS_WIN)
|
| gfx::Point mouse_location;
|
| @@ -451,7 +451,7 @@ TEST_F(WindowTest, MoveCursorToWithComplexTransform) {
|
| transform.Translate(10.0, 20.0);
|
| transform.Rotate(10.0);
|
| transform.Scale(0.3f, 0.5f);
|
| - host()->SetTransform(root_transform);
|
| + host()->SetRootTransform(root_transform);
|
| w1->SetTransform(transform);
|
| w11->SetTransform(transform);
|
| w111->SetTransform(transform);
|
| @@ -1494,7 +1494,7 @@ TEST_F(WindowTest, Transform) {
|
| gfx::Transform transform;
|
| transform.Translate(size.height(), 0);
|
| transform.Rotate(90.0);
|
| - host()->SetTransform(transform);
|
| + host()->SetRootTransform(transform);
|
|
|
| // The size should be the transformed size.
|
| gfx::Size transformed_size(size.height(), size.width());
|
| @@ -1521,7 +1521,7 @@ TEST_F(WindowTest, TransformGesture) {
|
| gfx::Transform transform;
|
| transform.Translate(size.height(), 0.0);
|
| transform.Rotate(90.0);
|
| - host()->SetTransform(transform);
|
| + host()->SetRootTransform(transform);
|
|
|
| ui::TouchEvent press(
|
| ui::ET_TOUCH_PRESSED, gfx::Point(size.height() - 10, 10), 0, getTime());
|
|
|