Chromium Code Reviews| Index: ui/views/style/mac/dialog_button_border_mac.cc |
| diff --git a/ui/views/style/mac/dialog_button_border_mac.cc b/ui/views/style/mac/dialog_button_border_mac.cc |
| index 24cedaec8cb19ee46e5d0016ba419e48a124323d..014974275001c38ea1a5238c3f044e1d40755a7c 100644 |
| --- a/ui/views/style/mac/dialog_button_border_mac.cc |
| +++ b/ui/views/style/mac/dialog_button_border_mac.cc |
| @@ -38,7 +38,7 @@ const double kInnerShadowBlurRadius = 2.0; |
| const int kPaddingX = 14; |
| const int kPaddingY = 4; |
| -skia::RefPtr<SkShader> GetButtonGradient(int height, |
| +sk_sp<SkShader> GetButtonGradient(int height, |
|
danakj
2016/03/25 18:18:09
mind s/Get/Create/ while you're here?
tomhudson
2016/03/25 19:27:31
Done.
|
| Button::ButtonState state) { |
| ColorByState start = {0xFFF0F0F0, 0xFFF4F4F4, 0xFFEBEBEB, 0xFFEDEDED}; |
| ColorByState end = {0xFFE0E0E0, 0xFFE4E4E4, 0xFFDBDBDB, 0xFFDEDEDE}; |
| @@ -50,11 +50,9 @@ skia::RefPtr<SkShader> GetButtonGradient(int height, |
| SkColor gradient_colors[] = {start[state], start[state], end[state]}; |
| SkScalar gradient_positions[] = {0.0, 0.38, 1.0}; |
| - skia::RefPtr<SkShader> gradient_shader = |
| - skia::AdoptRef(SkGradientShader::CreateLinear( |
| + return SkGradientShader::MakeLinear( |
| gradient_points, gradient_colors, gradient_positions, 3, |
| - SkShader::kClamp_TileMode)); |
| - return gradient_shader; |
| + SkShader::kClamp_TileMode); |
| } |
| void DrawConstrainedButtonBackground(const SkRect& button_rect, |
| @@ -78,9 +76,7 @@ void DrawConstrainedButtonBackground(const SkRect& button_rect, |
| paint.setLooper(looper.get()); |
| // Background. |
| - skia::RefPtr<SkShader> gradient_shader = |
| - GetButtonGradient(rect.height(), button_state); |
| - paint.setShader(gradient_shader.get()); |
| + paint.setShader(GetButtonGradient(rect.height(), button_state)); |
| paint.setStyle(SkPaint::kFill_Style); |
| paint.setFlags(SkPaint::kAntiAlias_Flag); |
| canvas->drawRoundRect(rect, kCornerRadius, kCornerRadius, paint); |