Consolidate bubble border code.

ui/views/bubble/bubble_frame_view_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/base/hit_test.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 typedef ViewsTestBase BubbleFrameViewTest;
 
+namespace {
+
 const BubbleBorder::ArrowLocation kArrow = BubbleBorder::TOP_LEFT;
 const int kBubbleWidth = 200;
 const int kBubbleHeight = 200;
 const SkColor kBackgroundColor = SK_ColorRED;
 const int kDefaultMargin = 6;
-
-namespace {
+const int kIgnore = -1;

[msw, 2012/09/20 00:07:23]

nit: remove

[xiyuan, 2012/09/20 16:56:51]

Done.

 
 class SizedBubbleDelegateView : public BubbleDelegateView {
  public:
   SizedBubbleDelegateView();
   virtual ~SizedBubbleDelegateView();
 
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
@@ skipping 73 matching lines @@
 
   gfx::Insets insets;
   frame.bubble_border()->GetInsets(&insets);
   int xposition = 95 - insets.width();
 
   // Test that the info bubble displays normally when it fits.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_LEFT, frame.bubble_border()->arrow_location());
   EXPECT_GT(window_bounds.x(), xposition);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on left.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_RIGHT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_LEFT, frame.bubble_border()->arrow_location());
   EXPECT_GT(window_bounds.x(), xposition);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on left or top.
   frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_RIGHT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_LEFT, frame.bubble_border()->arrow_location());
   EXPECT_GT(window_bounds.x(), xposition);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on top.
   frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_LEFT, frame.bubble_border()->arrow_location());
   EXPECT_GT(window_bounds.x(), xposition);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on top and right.
   frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(900, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_RIGHT, frame.bubble_border()->arrow_location());
   EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on right.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(900, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_RIGHT, frame.bubble_border()->arrow_location());
   EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
   EXPECT_GT(window_bounds.y(), 100 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 
   // Test bubble not fitting on bottom and right.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(900, 900, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::BOTTOM_RIGHT,
             frame.bubble_border()->arrow_location());
   EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
   EXPECT_LT(window_bounds.y(), 900 - 500 - 15);  // -15 to roughly compensate
                                                  // for arrow height.
 
   // Test bubble not fitting at the bottom.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_LEFT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 900, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::BOTTOM_LEFT, frame.bubble_border()->arrow_location());
   // The window should be right aligned with the anchor_rect.
   EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
   EXPECT_LT(window_bounds.y(), 900 - 500 - 15);  // -15 to roughly compensate
                                                  // for arrow height.
 
   // Test bubble not fitting at the bottom and left.
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_RIGHT);
   window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 900, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::BOTTOM_LEFT, frame.bubble_border()->arrow_location());
   // The window should be right aligned with the anchor_rect.
   EXPECT_LT(window_bounds.x(), 900 + 50 - 500);
   EXPECT_LT(window_bounds.y(), 900 - 500 - 15);  // -15 to roughly compensate
                                                  // for arrow height.
 }
 
 // Tests that the arrow is not moved when the info-bubble does not fit the
 // screen but moving it would make matter worse.
 TEST_F(BubbleFrameViewTest, GetUpdatedWindowBoundsMirroringFails) {
   TestBubbleFrameView frame;
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_LEFT);
   gfx::Rect window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(400, 100, 50, 50),  // |anchor_rect|
       gfx::Size(500, 700),          // |client_size|
-      true);                        // |try_mirroring_arrow|
+      true);                        // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_LEFT, frame.bubble_border()->arrow_location());
 }
 
-// Test that the arrow will not be mirrored when |try_mirroring_arrow| is false.
+// Test that the arrow will not be mirrored when |adjust_if_offscreen| is false.
 TEST_F(BubbleFrameViewTest, GetUpdatedWindowBoundsDontTryMirror) {
   TestBubbleFrameView frame;
   frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_RIGHT);
   gfx::Rect window_bounds = frame.GetUpdatedWindowBounds(
       gfx::Rect(100, 900, 50, 50),  // |anchor_rect|
       gfx::Size(500, 500),          // |client_size|
-      false);                       // |try_mirroring_arrow|
+      false);                       // |adjust_if_offscreen|
   EXPECT_EQ(BubbleBorder::TOP_RIGHT, frame.bubble_border()->arrow_location());
   // The coordinates should be pointing to anchor_rect from TOP_RIGHT.
   EXPECT_LT(window_bounds.x(), 100 + 50 - 500);
   EXPECT_GT(window_bounds.y(), 900 + 50 - 10);  // -10 to roughly compensate for
                                                 // arrow overlap.
 }
 
+// Test that the center arrow is moved as needed to fit the screen.
+TEST_F(BubbleFrameViewTest, GetUpdatedWindowBoundsCenterArrows) {
+  TestBubbleFrameView frame;
+  gfx::Rect window_bounds;
+
+  // Test that the bubble displays normally when it fits.
+  frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(500, 100, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::TOP_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.x() + window_bounds.width() / 2, 525);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(500, 900, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::BOTTOM_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.x() + window_bounds.width() / 2, 525);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::LEFT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(100, 400, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::LEFT_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.y() + window_bounds.height() / 2, 425);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::RIGHT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(900, 400, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::RIGHT_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.y() + window_bounds.height() / 2, 425);
+
+  // Test bubble not fitting left screen edge.
+  frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::TOP_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.x(), 0);
+  EXPECT_GT(window_bounds.x() + window_bounds.width() / 2, 125);

[msw, 2012/09/20 00:07:23]

GT 125 seems too loose, it's EQ 250, right?

[xiyuan, 2012/09/20 16:56:51]

This is intended to verify that bubble's center is to the right of anchor's
center because of the adjustment.

But seem unnecessary since we already checked that bubble's left is at the
monitor's left edge before this statement and bubble's arrow is pointing at
anchor's center after this.

Removed this check.

+  EXPECT_EQ(window_bounds.x() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 125);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(100, 900, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::BOTTOM_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.x(), 0);
+  EXPECT_GT(window_bounds.x() + window_bounds.width() / 2, 125);

[msw, 2012/09/20 00:07:23]

ditto: GT 125 seems too loose, it's EQ 250, right?

+  EXPECT_EQ(window_bounds.x() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 125);
+
+  // Test bubble not fitting right screen edge.
+  frame.bubble_border()->set_arrow_location(BubbleBorder::TOP_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(900, 100, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::TOP_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.right(), 1000);
+  EXPECT_LT(window_bounds.x() + window_bounds.width() / 2, 925);

[msw, 2012/09/20 00:07:23]

similar: LT 925 seems too loose, it's EQ 750, right?

+  EXPECT_EQ(window_bounds.x() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::BOTTOM_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(900, 900, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::BOTTOM_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.right(), 1000);
+  EXPECT_LT(window_bounds.x() + window_bounds.width() / 2, 925);

[msw, 2012/09/20 00:07:23]

ditto: LT 925 seems too loose, it's EQ 750, right?

+  EXPECT_EQ(window_bounds.x() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
+
+  // Test bubble not fitting top screen edge.
+  frame.bubble_border()->set_arrow_location(BubbleBorder::LEFT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(100, 100, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::LEFT_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.y(), 0);
+  EXPECT_GT(window_bounds.y() + window_bounds.height() / 2, 125);

[msw, 2012/09/20 00:07:23]

similar: GT 125 seems too loose, it's EQ 250, right?

+  EXPECT_EQ(window_bounds.y() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 125);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::RIGHT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(900, 100, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::RIGHT_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.y(), 0);
+  EXPECT_GT(window_bounds.y() + window_bounds.height() / 2, 125);

[msw, 2012/09/20 00:07:23]

ditto: GT 125 seems too loose, it's EQ 250, right?

+  EXPECT_EQ(window_bounds.y() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 125);
+
+  // Test bubble not fitting bottom screen edge.
+  frame.bubble_border()->set_arrow_location(BubbleBorder::LEFT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(100, 900, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::LEFT_CENTER, frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.bottom(), 1000);
+  EXPECT_LT(window_bounds.y() + window_bounds.height() / 2, 925);

[msw, 2012/09/20 00:07:23]

similar: LT 925 seems too loose, it's EQ 750, right?

+  EXPECT_EQ(window_bounds.y() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
+
+  frame.bubble_border()->set_arrow_location(BubbleBorder::RIGHT_CENTER);
+  window_bounds = frame.GetUpdatedWindowBounds(
+      gfx::Rect(900, 900, 50, 50),  // |anchor_rect|
+      gfx::Size(500, 500),          // |client_size|
+      true);                        // |adjust_if_offscreen|
+  EXPECT_EQ(BubbleBorder::RIGHT_CENTER,
+            frame.bubble_border()->arrow_location());
+  EXPECT_EQ(window_bounds.bottom(), 1000);
+  EXPECT_LT(window_bounds.y() + window_bounds.height() / 2, 925);

[msw, 2012/09/20 00:07:23]

ditto: LT 925 seems too loose, it's EQ 750, right?

+  EXPECT_EQ(window_bounds.y() +
+            frame.bubble_border()->GetArrowOffset(window_bounds.size()), 925);
+}
+
 }  // namespace views