Return primary display if out of bounds point or NULL ponter is passed to gfx::Screen::GeDisplayNea

ash/wm/workspace/workspace_window_resizer_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 "ash/wm/workspace/workspace_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "ash/wm/workspace/phantom_window_controller.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 namespace {
@@ skipping 22 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
 class WorkspaceWindowResizerTest : public test::AshTestBase {
  public:
   WorkspaceWindowResizerTest() : window_(NULL) {}
   virtual ~WorkspaceWindowResizerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
+    UpdateDisplay(StringPrintf("800x%d", kRootHeight));
+
     aura::RootWindow* root = Shell::GetPrimaryRootWindow();
-    root->SetHostSize(gfx::Size(800, kRootHeight));
-
     gfx::Rect root_bounds(root->bounds());
     EXPECT_EQ(kRootHeight, root_bounds.height());
+    EXPECT_EQ(800, root_bounds.width());
     Shell::GetInstance()->SetDisplayWorkAreaInsets(root, gfx::Insets());
     window_.reset(new aura::Window(&delegate_));
     window_->SetType(aura::client::WINDOW_TYPE_NORMAL);
     window_->Init(ui::LAYER_NOT_DRAWN);
     window_->SetParent(NULL);
     window_->set_id(1);
 
     window2_.reset(new aura::Window(&delegate2_));
     window2_->SetType(aura::client::WINDOW_TYPE_NORMAL);
     window2_->Init(ui::LAYER_NOT_DRAWN);
@@ skipping 408 matching lines @@
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              gfx::Screen::GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window.
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
     ASSERT_TRUE(resizer.get());
     // Drag the pointer to the right. Once it reaches the right edge of the
-    // primary display, it warps to the secondary. Since the secondary root
-    // window's native origin held by aura::RootWindowHost is (0, 600), and a
-    // mouse drag event has a location in the primary root window's coordinates,
-    // (810, 0) right means (10, 0) in the second root window's coordinates.
-    resizer->Drag(CalculateDragPoint(*resizer, 810, 0), 0);
+    // primary display, it warps to the secondary.
+    resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
     resizer->CompleteDrag(0);
     // The whole window is on the secondary display now. The parent should be
     // changed.
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
-    EXPECT_EQ("10,0 50x60", window_->bounds().ToString());
+    EXPECT_EQ("0,10 50x60", window_->bounds().ToString());
   }
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              gfx::Screen::GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window and move the pointer to (790, 10).
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 790, 10), 0);
     resizer->CompleteDrag(0);
     // Since the pointer is still on the primary root window, the parent should
     // not be changed.
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
     EXPECT_EQ("790,10 50x60", window_->bounds().ToString());
   }
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              gfx::Screen::GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab the top-right edge of the window and move the pointer to (0, 10)
     // in the secondary root window's coordinates.
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(49, 0), HTCAPTION, empty_windows()));
     ASSERT_TRUE(resizer.get());
-    resizer->Drag(CalculateDragPoint(*resizer, -49 + 800, 0),
-                  ui::EF_CONTROL_DOWN);
+    resizer->Drag(CalculateDragPoint(*resizer, 751, 10), ui::EF_CONTROL_DOWN);
     resizer->CompleteDrag(0);
-    // Since the pointer is on the secondary, the parent should not be changed
+    // Since the pointer is on the secondary, the parent should be changed
     // even though only small fraction of the window is within the secondary
     // root window's bounds.
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
-    EXPECT_EQ("-49,0 50x60", window_->bounds().ToString());
+    EXPECT_EQ("-49,10 50x60", window_->bounds().ToString());
   }
 }
 
 // Verifies a window can be moved from the secondary display to primary.
 TEST_F(WorkspaceWindowResizerTest,
        MAYBE_WindowDragWithMultiDisplaysRightToLeft) {
   UpdateDisplay("800x600,800x600");
   Shell::GetInstance()->shelf()->LayoutShelf();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   window_->SetBoundsInScreen(
       gfx::Rect(800, 00, 50, 60),
       gfx::Screen::GetDisplayNearestWindow(root_windows[1]));
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window.
     scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
         window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
     ASSERT_TRUE(resizer.get());
     // Move the mouse near the right edge, (798, 0), of the primary display.
-    resizer->Drag(CalculateDragPoint(*resizer, -2, 0),
-                  ui::EF_CONTROL_DOWN);
+    resizer->Drag(CalculateDragPoint(*resizer, -2, 0), ui::EF_CONTROL_DOWN);
     resizer->CompleteDrag(0);
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
     EXPECT_EQ("798,0 50x60", window_->bounds().ToString());
   }
 }
 
 // Verifies the style of the drag phantom window is correct.
 TEST_F(WorkspaceWindowResizerTest, MAYBE_PhantomStyle) {
   UpdateDisplay("800x600,800x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ skipping 28 matching lines @@
         controller->phantom_widget_->GetNativeWindow()->layer()->children();
     EXPECT_FALSE(layers.empty());
     EXPECT_EQ(resizer->layer_, layers.back());
 
     // |window_| should be opaque since the pointer is still on the primary
     // root window. The phantom should be semi-transparent.
     EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
     EXPECT_GT(1.0f, controller->GetOpacity());
 
     // Enter the pointer to the secondary display.
-    resizer->Drag(CalculateDragPoint(*resizer, 810, 0), 0);
+    resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
     EXPECT_FALSE(resizer->snap_phantom_window_controller_.get());
     controller = resizer->drag_phantom_window_controller_.get();
     ASSERT_TRUE(controller);
     EXPECT_EQ(PhantomWindowController::STYLE_DRAGGING, controller->style());
     // |window_| should be transparent, and the phantom should be opaque.
     EXPECT_GT(1.0f, window_->layer()->opacity());
     EXPECT_FLOAT_EQ(1.0f, controller->GetOpacity());
 
     resizer->CompleteDrag(0);
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
@@ skipping 384 matching lines @@
   resizer->Drag(CalculateDragPoint(*resizer, 142, 119), 0);
   EXPECT_EQ("152,130 20x30", window_->bounds().ToString());
 
   // Move |window| one pixel above the bottom of |window2|.
   resizer->Drag(CalculateDragPoint(*resizer, 142, 169), 0);
   EXPECT_EQ("152,180 20x30", window_->bounds().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash