Fixes bug where button borders are not always painted in High DPI mode

ui/gfx/native_theme_base.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/gfx/native_theme_base.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "grit/gfx_resources.h"
@@ skipping 471 matching lines @@
   gfx::Rect bounds = rect.Center(gfx::Size(image->width(), image->height()));
   DrawBitmapInt(canvas, *image, 0, 0, image->width(), image->height(),
       bounds.x(), bounds.y(), bounds.width(), bounds.height());
 }
 
 void NativeThemeBase::PaintButton(SkCanvas* canvas,
                                    State state,
                                    const gfx::Rect& rect,
                                    const ButtonExtraParams& button) const {
   SkPaint paint;
-  SkRect skrect;
   const int kRight = rect.right();
   const int kBottom = rect.bottom();
+  SkRect skrect = SkRect::MakeLTRB(rect.x(), rect.y(), kRight, kBottom);
   SkColor base_color = button.background_color;
 
   color_utils::HSL base_hsl;
   color_utils::SkColorToHSL(base_color, &base_hsl);
 
   // Our standard gradient is from 0xdd to 0xf8. This is the amount of
   // increased luminance between those values.
   SkColor light_color(BrightenColor(base_hsl, SkColorGetA(base_color), 0.105));
 
   // If the button is too small, fallback to drawing a single, solid color
   if (rect.width() < 5 || rect.height() < 5) {
     paint.setColor(base_color);
-    skrect.set(rect.x(), rect.y(), kRight, kBottom);
     canvas->drawRect(skrect, paint);
     return;
   }
 
-  if (button.has_border) {
-    const int kBorderAlpha = state == kHovered ? 0x80 : 0x55;
-    paint.setARGB(kBorderAlpha, 0, 0, 0);
-    canvas->drawLine(rect.x() + 1, rect.y(), kRight - 1, rect.y(), paint);
-    canvas->drawLine(kRight - 1, rect.y() + 1, kRight - 1, kBottom - 1, paint);
-    canvas->drawLine(rect.x() + 1, kBottom - 1, kRight - 1, kBottom - 1, paint);
-    canvas->drawLine(rect.x(), rect.y() + 1, rect.x(), kBottom - 1, paint);
-  }
-
   paint.setColor(SK_ColorBLACK);
   const int kLightEnd = state == kPressed ? 1 : 0;
   const int kDarkEnd = !kLightEnd;
   SkPoint gradient_bounds[2];
   gradient_bounds[kLightEnd].iset(rect.x(), rect.y());
   gradient_bounds[kDarkEnd].iset(rect.x(), kBottom - 1);
   SkColor colors[2];
   colors[0] = light_color;
   colors[1] = base_color;
 
   SkShader* shader = SkGradientShader::CreateLinear(
       gradient_bounds, colors, NULL, 2, SkShader::kClamp_TileMode, NULL);
   paint.setStyle(SkPaint::kFill_Style);
+  paint.setAntiAlias(true);
   paint.setShader(shader);
   shader->unref();
 
-  if (button.has_border) {
-    skrect.set(rect.x() + 1, rect.y() + 1, kRight - 1, kBottom - 1);
-  } else {
-    skrect.set(rect.x(), rect.y(), kRight, kBottom);
-  }
-  canvas->drawRect(skrect, paint);
+  canvas->drawRoundRect(skrect, SkIntToScalar(1), SkIntToScalar(1), paint);
   paint.setShader(NULL);
 
   if (button.has_border) {
-    paint.setColor(BrightenColor(base_hsl, SkColorGetA(base_color), -0.0588));
-    canvas->drawPoint(rect.x() + 1, rect.y() + 1, paint);
-    canvas->drawPoint(kRight - 2, rect.y() + 1, paint);
-    canvas->drawPoint(rect.x() + 1, kBottom - 2, paint);
-    canvas->drawPoint(kRight - 2, kBottom - 2, paint);
+    const int kBorderAlpha = state == kHovered ? 0x80 : 0x55;
+    paint.setStyle(SkPaint::kStroke_Style);
+    paint.setStrokeWidth(SkIntToScalar(1));
+    paint.setARGB(kBorderAlpha, 0, 0, 0);
+    skrect.inset(SkFloatToScalar(.5f), SkFloatToScalar(.5f));
+    canvas->drawRoundRect(skrect, SkIntToScalar(1), SkIntToScalar(1), paint);
   }
 }
 
 void NativeThemeBase::PaintTextField(SkCanvas* canvas,
                                      State state,
                                      const gfx::Rect& rect,
                                      const TextFieldExtraParams& text) const {
   // The following drawing code simulates the user-agent css border for
   // text area and text input so that we do not break layout tests. Once we
   // have decided the desired looks, we should update the code here and
@@ skipping 416 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace gfx