Simplify the NO_SHADOW_OPAQUE_BORDER path with addRoundRect.

ui/views/bubble/bubble_frame_view.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/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "grit/ui_resources.h"
 #include "ui/base/hit_test.h"
@@ skipping 84 matching lines @@
     return HTCAPTION;
   return GetWidget()->client_view()->NonClientHitTest(point);
 }
 
 void BubbleFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
   if (bubble_border_->shadow() != BubbleBorder::NO_SHADOW_OPAQUE_BORDER)
     return;
 
   // Use a window mask roughly matching the border in the image assets.
-
-  // Stroke size in pixels of borders in image assets.
   static const int kBorderStrokeSize = 1;
-
+  static const SkScalar kCornerRadius = SkIntToScalar(6);
   gfx::Insets border_insets = bubble_border_->GetInsets();
-  SkRect rect = {SkIntToScalar(border_insets.left() - kBorderStrokeSize),
-                 SkIntToScalar(border_insets.top() - kBorderStrokeSize),
-                 SkIntToScalar(size.width() - border_insets.right() +
-                               kBorderStrokeSize),
-                 SkIntToScalar(size.height() - border_insets.bottom() +
-                               kBorderStrokeSize)};
-
-  // Approximate rounded corners matching the border.
-  SkPoint polygon[] = {
-    {rect.left() + SkIntToScalar(2), rect.top()},
-    {rect.left() + SkIntToScalar(1), rect.top() + SkIntToScalar(1)},
-    {rect.left(), rect.top() + SkIntToScalar(2)},
-
-    {rect.left(), rect.bottom() - SkIntToScalar(3)},
-    {rect.left() + SkIntToScalar(1), rect.bottom() - SkIntToScalar(2)},
-    {rect.left() + SkIntToScalar(2), rect.bottom()},
-
-    {rect.right() - SkIntToScalar(3), rect.bottom()},
-    {rect.right() - SkIntToScalar(1), rect.bottom() - SkIntToScalar(2)},
-    {rect.right(), rect.bottom() - SkIntToScalar(3)},
-
-    {rect.right(), rect.top() + SkIntToScalar(2)},
-    {rect.right() - SkIntToScalar(1), rect.top() + SkIntToScalar(1)},
-    {rect.right() - SkIntToScalar(2), rect.top()}
-  };
-
-  window_mask->addPoly(polygon, sizeof(polygon)/sizeof(polygon[0]), true);
+  const SkRect rect = { SkIntToScalar(border_insets.left() - kBorderStrokeSize),
+                        SkIntToScalar(border_insets.top() - kBorderStrokeSize),
+                        SkIntToScalar(size.width() - border_insets.right() +
+                                      kBorderStrokeSize),
+                        SkIntToScalar(size.height() - border_insets.bottom() +
+                                      kBorderStrokeSize) };
+  window_mask->addRoundRect(rect, kCornerRadius, kCornerRadius);
 }
 
 void BubbleFrameView::ResetWindowControls() {}
 
 void BubbleFrameView::UpdateWindowIcon() {}
 
 void BubbleFrameView::UpdateWindowTitle() {}
 
 gfx::Insets BubbleFrameView::GetInsets() const {
   gfx::Insets insets = content_margins_;
@@ skipping 159 matching lines @@
   // |offscreen_adjust|, e.g. positive |offscreen_adjust| means bubble
   // window needs to be moved to the right and that means we need to move arrow
   // to the left, and that means negative offset.
   bubble_border_->set_arrow_offset(
       bubble_border_->GetArrowOffset(window_bounds.size()) - offscreen_adjust);
   if (offscreen_adjust)
     SchedulePaint();
 }
 
 }  // namespace views