Removed a few manual roundrect path creations

chrome/browser/ui/views/status_bubble_views.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 "chrome/browser/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/elide_url.h"
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/aura/window.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
@@ skipping 323 matching lines @@
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
   SkColor toolbar_color = theme_service_->GetColor(
       ThemeProperties::COLOR_TOOLBAR);
   paint.setColor(toolbar_color);
 
   gfx::Rect popup_bounds = popup_->GetWindowBoundsInScreen();
 
   // Figure out how to round the bubble's four corners.
-  SkScalar rad[8];
+  int radTL = 0;
+  int radTR = 0;
+  int radBL = 0;
+  int radBR = 0;
 
   // Top Edges - if the bubble is in its bottom position (sticking downwards),
   // then we square the top edges. Otherwise, we square the edges based on the
   // position of the bubble within the window (the bubble is positioned in the
   // southeast corner in RTL and in the southwest corner in LTR).
-  if (style_ == STYLE_BOTTOM) {
-    // Top Left corner.
-    rad[0] = 0;
-    rad[1] = 0;
-
-    // Top Right corner.
-    rad[2] = 0;
-    rad[3] = 0;
-  } else {
+  if (style_ != STYLE_BOTTOM) {
     if (base::i18n::IsRTL() != (style_ == STYLE_STANDARD_RIGHT)) {
       // The text is RtL or the bubble is on the right side (but not both).
-
-      // Top Left corner.
-      rad[0] = SkIntToScalar(kBubbleCornerRadius);
-      rad[1] = SkIntToScalar(kBubbleCornerRadius);
-
-      // Top Right corner.
-      rad[2] = 0;
-      rad[3] = 0;
+      radTL = kBubbleCornerRadius;
     } else {
-      // Top Left corner.
-      rad[0] = 0;
-      rad[1] = 0;
-
-      // Top Right corner.
-      rad[2] = SkIntToScalar(kBubbleCornerRadius);
-      rad[3] = SkIntToScalar(kBubbleCornerRadius);
+      radTR = kBubbleCornerRadius;
     }
   }
 
-  // Bottom edges - square these off if the bubble is in its standard position
-  // (sticking upward).
-  if (style_ == STYLE_STANDARD || style_ == STYLE_STANDARD_RIGHT) {
-    // Bottom Right Corner.
-    rad[4] = 0;
-    rad[5] = 0;
-
-    // Bottom Left Corner.
-    rad[6] = 0;
-    rad[7] = 0;
-  } else {
-    // Bottom Right Corner.
-    rad[4] = SkIntToScalar(kBubbleCornerRadius);
-    rad[5] = SkIntToScalar(kBubbleCornerRadius);
-
-    // Bottom Left Corner.
-    rad[6] = SkIntToScalar(kBubbleCornerRadius);
-    rad[7] = SkIntToScalar(kBubbleCornerRadius);
+  // Bottom edges - Keep these squared off if the bubble is in its standard
+  // position (sticking upward).
+  if (style_ != STYLE_STANDARD && style_ != STYLE_STANDARD_RIGHT) {
+    radBR = kBubbleCornerRadius;
+    radBL = kBubbleCornerRadius;
   }
 
   // Draw the bubble's shadow.
   int width = popup_bounds.width();
   int height = popup_bounds.height();
-  SkRect rect(gfx::RectToSkRect(gfx::Rect(popup_bounds.size())));
-  SkPath shadow_path;
-  shadow_path.addRoundRect(rect, rad, SkPath::kCW_Direction);
+  gfx::Rect rect(gfx::Rect(popup_bounds.size()));
   SkPaint shadow_paint;
   shadow_paint.setAntiAlias(true);
   shadow_paint.setColor(kShadowColor);
-  canvas->DrawPath(shadow_path, shadow_paint);
+  canvas->DrawRoundRect(rect, radTL, radTR, radBL, radBR, shadow_paint);

[sky, 2014/09/15 19:11:17]

This seems to be the only place using this variant of DrawRoundRect. I would
rather keep it here.

[sky, 2014/09/15 21:51:07]

You should be able to use canvas->sk_canvas()->... fine here.

 
   // Draw the bubble.
-  rect.set(SkIntToScalar(kShadowThickness),
-           SkIntToScalar(kShadowThickness),
-           SkIntToScalar(width - kShadowThickness),
-           SkIntToScalar(height - kShadowThickness));
-  SkPath path;
-  path.addRoundRect(rect, rad, SkPath::kCW_Direction);
-  canvas->DrawPath(path, paint);
+  rect.SetRect(SkIntToScalar(kShadowThickness),
+               SkIntToScalar(kShadowThickness),
+               SkIntToScalar(width),
+               SkIntToScalar(height));
+  canvas->DrawRoundRect(rect, radTL, radTR, radBL, radBR, paint);
 
   // Draw highlight text and then the text body. In order to make sure the text
   // is aligned to the right on RTL UIs, we mirror the text bounds if the
   // locale is RTL.
   const gfx::FontList font_list;
   int text_width = std::min(
       gfx::GetStringWidth(text_, font_list),
       width - (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding);
   int text_height = height - (kShadowThickness * 2);
   gfx::Rect body_bounds(kShadowThickness + kTextPositionX,
@@ skipping 442 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }