aura: Take transformation into account when computing window bounds in root-window/screen.

ash/wm/overview/window_selector_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 180 matching lines @@
 
   gfx::RectF GetTransformedTargetBounds(aura::Window* window) {
     gfx::RectF bounds(ScreenUtil::ConvertRectToScreen(
         window->parent(), window->layer()->GetTargetBounds()));
     gfx::Transform transform(GetTransformRelativeTo(bounds.origin(),
         window->layer()->GetTargetTransform()));
     transform.TransformRect(&bounds);
     return bounds;
   }
 
-  gfx::RectF GetTransformedBoundsInRootWindow(aura::Window* window) {
-    gfx::RectF bounds = gfx::Rect(window->bounds().size());
-    aura::Window* root = window->GetRootWindow();
-    CHECK(window->layer());
-    CHECK(root->layer());
-    gfx::Transform transform;
-    if (!window->layer()->GetTargetTransformRelativeTo(root->layer(),
-                                                       &transform)) {
-      return gfx::RectF();
-    }
-    transform.TransformRect(&bounds);
-    return bounds;
-  }
-
   void ClickWindow(aura::Window* window) {
     aura::test::EventGenerator event_generator(window->GetRootWindow(), window);
     gfx::RectF target = GetTransformedBounds(window);
     event_generator.ClickLeftButton();
   }
 
   bool IsSelecting() {
     return ash::Shell::GetInstance()->window_selector_controller()->
         IsSelecting();
   }
@@ skipping 819 matching lines @@
   RunAllPendingInMessageLoop();
 }
 
 TEST_F(WindowSelectorTest, HitTestingInOverview) {
   gfx::Rect window_bounds(20, 10, 200, 300);
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(window_bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(window_bounds));
 
   ToggleOverview();
-  gfx::RectF bounds1 = GetTransformedBoundsInRootWindow(window1.get());
-  gfx::RectF bounds2 = GetTransformedBoundsInRootWindow(window2.get());
+  gfx::Rect bounds1 = window1->GetBoundsInRootWindow();
+  gfx::Rect bounds2 = window2->GetBoundsInRootWindow();
   EXPECT_NE(bounds1.ToString(), bounds2.ToString());
 
   ui::EventTarget* root_target = root_window;
   ui::EventTargeter* targeter = root_target->GetEventTargeter();
   aura::Window* windows[] = { window1.get(), window2.get() };
   for (size_t w = 0; w < arraysize(windows); ++w) {
-    gfx::RectF bounds = GetTransformedBoundsInRootWindow(windows[w]);
+    gfx::Rect bounds = windows[w]->GetBoundsInRootWindow();
     gfx::Point points[] = {
       gfx::Point(bounds.x(), bounds.y()),
       gfx::Point(bounds.right() - 1, bounds.y()),
       gfx::Point(bounds.x(), bounds.bottom() - 1),
       gfx::Point(bounds.right() - 1, bounds.bottom() - 1),
     };
 
     for (size_t p = 0; p < arraysize(points); ++p) {
       ui::MouseEvent event(ui::ET_MOUSE_MOVED, points[p], points[p],
                            ui::EF_NONE, ui::EF_NONE);
       EXPECT_EQ(windows[w],
                 targeter->FindTargetForEvent(root_target, &event));
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash