ui: Remove implicit flooring in skia rect conversion methods.

ui/aura/window_unittest.cc

 // Copyright (c) 2012 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.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 403 matching lines @@
   scoped_ptr<Window> w1(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500), NULL));
   scoped_ptr<Window> w11(
       CreateTestWindow(SK_ColorGREEN, 11, gfx::Rect(5, 5, 100, 100), w1.get()));
   scoped_ptr<Window> w111(
       CreateTestWindow(SK_ColorCYAN, 111, gfx::Rect(5, 5, 75, 75), w11.get()));
   scoped_ptr<Window> w1111(
       CreateTestWindow(SK_ColorRED, 1111, gfx::Rect(5, 5, 50, 50), w111.get()));
 
   RootWindow* root = root_window();
+
+  // The root window expects transforms that produce integer rects.
+  gfx::Transform root_transform;
+  root_transform.ConcatScale(2.0f, 3.0f);
+  root_transform.ConcatTranslate(-50, -50);
+  root_transform.ConcatRotate(-90.0f);
+  root_transform.ConcatTranslate(60, 70);
+
   gfx::Transform transform;
   transform.ConcatScale(0.3f, 0.5f);
   transform.ConcatRotate(10.0f);
   transform.ConcatTranslate(10, 20);
 
-  root->SetTransform(transform);
+  root->SetTransform(root_transform);
   w1->SetTransform(transform);
   w11->SetTransform(transform);
   w111->SetTransform(transform);
   w1111->SetTransform(transform);
 
   w1111->MoveCursorTo(gfx::Point(10, 10));
 
 #if !defined(OS_WIN)
-  // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.OD
-  EXPECT_EQ("11,47", root->QueryMouseLocationForTest().ToString());
+  // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.
+  EXPECT_EQ("169,80", root->QueryMouseLocationForTest().ToString());
 #endif
   EXPECT_EQ("20,53",
       gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
 }
 
 TEST_F(WindowTest, HitTest) {
   Window w1(new ColorTestWindowDelegate(SK_ColorWHITE));
   w1.set_id(1);
   w1.Init(ui::LAYER_TEXTURED);
   w1.SetBounds(gfx::Rect(10, 20, 50, 60));
@@ skipping 2101 matching lines @@
   // Move |w2| to be a child of |w1|.
   w1->AddChild(w2.get());
   // Sine we moved in the same root, observer shouldn't be notified.
   EXPECT_EQ("0 0", observer.CountStringAndReset());
   // |w2| should still have focus after moving.
   EXPECT_TRUE(w2->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura