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

ui/aura/window_targeter_unittest.cc

 // Copyright (c) 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 "ui/aura/window_targeter.h"
 
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 22 matching lines @@
 };
 
 class WindowTargeterTest : public test::AuraTestBase {
  public:
   WindowTargeterTest() {}
   virtual ~WindowTargeterTest() {}
 
   Window* root_window() { return AuraTestBase::root_window(); }
 };
 
-gfx::RectF GetEffectiveVisibleBoundsInRootWindow(Window* window) {
-  gfx::RectF bounds = gfx::Rect(window->bounds().size());
-  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;
-}
-
 TEST_F(WindowTargeterTest, Basic) {
   test::TestWindowDelegate delegate;
   scoped_ptr<Window> window(CreateNormalWindow(1, root_window(), &delegate));
   Window* one = CreateNormalWindow(2, window.get(), &delegate);
   Window* two = CreateNormalWindow(3, window.get(), &delegate);
 
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   one->SetBounds(gfx::Rect(0, 0, 500, 100));
   two->SetBounds(gfx::Rect(501, 0, 500, 1000));
 
@@ skipping 69 matching lines @@
     ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
                          ui::EF_NONE, ui::EF_NONE);
     EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root_target, &mouse));
   }
 
   // Scale |window| by 50%. This should move it away from underneath
   // |event_location|, so an event in that location will not be targeted to it.
   gfx::Transform transform;
   transform.Scale(0.5, 0.5);
   window->SetTransform(transform);
-  EXPECT_EQ(gfx::RectF(100, 20, 200, 40).ToString(),
-            GetEffectiveVisibleBoundsInRootWindow(window.get()).ToString());
+  EXPECT_EQ(gfx::Rect(100, 20, 200, 40).ToString(),
+            window->GetBoundsInRootWindow().ToString());
   {
     ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
                          ui::EF_NONE, ui::EF_NONE);
     EXPECT_EQ(root_window(), targeter->FindTargetForEvent(root_target, &mouse));
   }
 
   transform = gfx::Transform();
   transform.Translate(200, 10);
   transform.Scale(0.5, 0.5);
   window->SetTransform(transform);
-  EXPECT_EQ(gfx::RectF(300, 30, 200, 40).ToString(),
-            GetEffectiveVisibleBoundsInRootWindow(window.get()).ToString());
+  EXPECT_EQ(gfx::Rect(300, 30, 200, 40).ToString(),
+            window->GetBoundsInRootWindow().ToString());
   {
     ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
                          ui::EF_NONE, ui::EF_NONE);
     EXPECT_EQ(window.get(), targeter->FindTargetForEvent(root_target, &mouse));
   }
 }
 
 }  // namespace aura