Fixed BubbleBorder sizing problems & added unit tests.

ui/views/bubble/bubble_border.h

Index: ui/views/bubble/bubble_border.h
diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h
index 15f0f85f60ddcae2a44a1f373ecc4dbb1320866f..0836eece6c5a163ae49d16760205287c8687ac35 100644
--- a/ui/views/bubble/bubble_border.h
+++ b/ui/views/bubble/bubble_border.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 
@@ -16,10 +17,37 @@ class Rect;
 }
 
 namespace views {
+class Painter;
 
 namespace internal {
-struct BorderImages;
-}
+
+// A helper that combines each border image-set painter with arrows and metrics.
+struct BorderImages {
+  BorderImages(const int border_image_ids[],
+               const int arrow_image_ids[],
+               int border_interior_thickness,
+               int arrow_interior_thickness,
+               int corner_radius);
+  virtual ~BorderImages();
+
+  scoped_ptr<Painter> border_painter;

[msw, 2014/08/22 20:54:44]

nit: add a base/memory/scoped_ptr.h include

[bruthig, 2014/08/22 22:55:03]

Done.

+  gfx::ImageSkia left_arrow;
+  gfx::ImageSkia top_arrow;
+  gfx::ImageSkia right_arrow;
+  gfx::ImageSkia bottom_arrow;
+
+  // The thickness of border and arrow images and their interior areas.
+  // Thickness is the width of left/right and the height of top/bottom images.
+  // The interior is measured without including stroke or shadow pixels.
+  int border_thickness;
+  int border_interior_thickness;
+  int arrow_thickness;
+  int arrow_interior_thickness;
+  // The corner radius of the bubble's rounded-rect interior area.
+  int corner_radius;
+};
+
+}  // namespace internal
 
 // Renders a border, with optional arrow, and a custom dropshadow.
 // This can be used to produce floating "bubble" objects with rounded corners.
@@ -173,11 +201,23 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
+  friend class BubbleBorderTest;

[msw, 2014/08/22 20:54:44]

Remove this (as per typedefing and/or moving kStroke use to test).

[bruthig, 2014/08/22 22:55:03]

Done.

+

[msw, 2014/08/22 20:54:44]

nit: remove blank line.

[bruthig, 2014/08/22 22:55:03]

Done.

+  FRIEND_TEST_ALL_PREFIXES(BubbleBorderTest, GetSizeForContentsSizeTest);
+  FRIEND_TEST_ALL_PREFIXES(BubbleBorderTest, GetBoundsOriginTest);
+
+  // The border and arrow stroke size used in image assets, in pixels.
+  static const int kStroke;
+
   gfx::Size GetSizeForContentsSize(const gfx::Size& contents_size) const;
   gfx::ImageSkia* GetArrowImage() const;
   gfx::Rect GetArrowRect(const gfx::Rect& bounds) const;
   void DrawArrow(gfx::Canvas* canvas, const gfx::Rect& arrow_bounds) const;
 
+  internal::BorderImages* GetImagesForTest() const {

[msw, 2014/08/22 20:54:44]

nit: define this in the .cc file (to match CamelCase function name).

[bruthig, 2014/08/22 22:55:03]

Done.

+    return images_;
+  }
+
   Arrow arrow_;
   int arrow_offset_;
   ArrowPaintType arrow_paint_type_;