aura: Try to make Linux host resize code more reliable.

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 929 matching lines @@
   EXPECT_TRUE(root->IsOrContainsFullscreenWindow());
 
   w11->Hide();
   EXPECT_FALSE(root->IsOrContainsFullscreenWindow());
 }
 
 #if !defined(OS_WIN)
 // Tests transformation on the desktop.
 TEST_F(WindowTest, Transform) {
   Desktop* desktop = Desktop::GetInstance();
-  gfx::Size size(200, 300);
-  desktop->SetHostSize(size);
   desktop->ShowDesktop();
-
-  EXPECT_EQ(gfx::Rect(size), gfx::Rect(desktop->GetHostSize()));
+  gfx::Size size = desktop->GetHostSize();
   EXPECT_EQ(gfx::Rect(size),
             gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()));
 
   // Rotate it clock-wise 90 degrees.
   ui::Transform transform;
   transform.SetRotate(90.0f);
   transform.ConcatTranslate(size.width(), 0);
   desktop->SetTransform(transform);
 
   // The size should be the transformed size.
-  EXPECT_EQ(gfx::Rect(0, 0, 300, 200), gfx::Rect(desktop->GetHostSize()));
-  EXPECT_EQ(gfx::Rect(0, 0, 300, 200), desktop->bounds());
-  EXPECT_EQ(gfx::Rect(0, 0, 300, 200),
+  gfx::Rect transformed_bounds(0, 0, size.height(), size.width());
+  EXPECT_EQ(transformed_bounds.size(), desktop->GetHostSize());
+  EXPECT_EQ(transformed_bounds, desktop->bounds());
+  EXPECT_EQ(transformed_bounds,
             gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()));

[oshima, 2011/10/21 19:55:45]

Just a suggestion. I've been using string to compare rect/ponit and find it
useful.

EXPECT_EQ(expected.ToString(), actual.ToString());
EXPECT_EQ("0,0 100x100", actual.ToString());

It makes it easy to read failure message.

 
   ActivateWindowDelegate d1;
   scoped_ptr<Window> w1(
       CreateTestWindowWithDelegate(&d1, 1, gfx::Rect(0, 10, 50, 50), NULL));
   w1->Show();
 
   MouseEvent mouseev1(ui::ET_MOUSE_PRESSED,
-                      gfx::Point(195, 5), ui::EF_LEFT_BUTTON_DOWN);
+                      gfx::Point(transformed_bounds.width() - 5, 5),
+                      ui::EF_LEFT_BUTTON_DOWN);
   desktop->DispatchMouseEvent(&mouseev1);
   EXPECT_FALSE(w1->GetFocusManager()->GetFocusedWindow());
   MouseEvent mouseup(ui::ET_MOUSE_RELEASED,
-                     gfx::Point(195, 5), ui::EF_LEFT_BUTTON_DOWN);
+                     gfx::Point(transformed_bounds.width() - 5, 5),
+                     ui::EF_LEFT_BUTTON_DOWN);
   desktop->DispatchMouseEvent(&mouseup);
 
   MouseEvent mouseev2(ui::ET_MOUSE_PRESSED,
-                      gfx::Point(185, 5), ui::EF_LEFT_BUTTON_DOWN);
+                      gfx::Point(transformed_bounds.width() - 15, 5),
+                      ui::EF_LEFT_BUTTON_DOWN);
   desktop->DispatchMouseEvent(&mouseev2);
   EXPECT_EQ(w1.get(), desktop->active_window());
   EXPECT_EQ(w1.get(), w1->GetFocusManager()->GetFocusedWindow());
 }
 #endif
 
 class ToplevelWindowTest : public WindowTest {
  public:
   ToplevelWindowTest() {}
   virtual ~ToplevelWindowTest() {}
@@ skipping 199 matching lines @@
 
   w3->Activate();
   EXPECT_EQ(w2.get(), active());
 
   w1->Activate();
   EXPECT_EQ(w1.get(), active());
 }
 
 }  // namespace test
 }  // namespace aura