OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/views/controls/menu/menu_image_util.h" | 5 #include "ui/views/controls/menu/menu_image_util.h" |
6 | 6 |
7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "grit/ui_resources.h" | 9 #include "grit/ui_resources.h" |
10 #include "third_party/skia/include/effects/SkGradientShader.h" | 10 #include "third_party/skia/include/effects/SkGradientShader.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 | 44 |
45 virtual void Draw(gfx::Canvas* canvas) OVERRIDE { | 45 virtual void Draw(gfx::Canvas* canvas) OVERRIDE { |
46 canvas->Translate(gfx::Vector2d(1, 1)); | 46 canvas->Translate(gfx::Vector2d(1, 1)); |
47 | 47 |
48 SkPoint gradient_points[3]; | 48 SkPoint gradient_points[3]; |
49 gradient_points[0].iset(0, 0); | 49 gradient_points[0].iset(0, 0); |
50 gradient_points[1].iset(0, | 50 gradient_points[1].iset(0, |
51 static_cast<int>(kIndicatorSize * kGradientStop)); | 51 static_cast<int>(kIndicatorSize * kGradientStop)); |
52 gradient_points[2].iset(0, kIndicatorSize); | 52 gradient_points[2].iset(0, kIndicatorSize); |
53 SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 }; | 53 SkColor gradient_colors[3] = { kGradient0, kGradient1, kGradient2 }; |
54 SkShader* shader = SkGradientShader::CreateLinear( | 54 skia::RefPtr<SkShader> shader = skia::AdoptRef( |
55 gradient_points, gradient_colors, NULL, arraysize(gradient_points), | 55 SkGradientShader::CreateLinear( |
56 SkShader::kClamp_TileMode, NULL); | 56 gradient_points, gradient_colors, NULL, arraysize(gradient_points), |
| 57 SkShader::kClamp_TileMode, NULL)); |
57 SkPaint paint; | 58 SkPaint paint; |
58 paint.setStyle(SkPaint::kFill_Style); | 59 paint.setStyle(SkPaint::kFill_Style); |
59 paint.setAntiAlias(true); | 60 paint.setAntiAlias(true); |
60 paint.setShader(shader); | 61 paint.setShader(shader.get()); |
61 shader->unref(); | |
62 int radius = kIndicatorSize / 2; | 62 int radius = kIndicatorSize / 2; |
63 canvas->sk_canvas()->drawCircle(radius, radius, radius, paint); | 63 canvas->sk_canvas()->drawCircle(radius, radius, radius, paint); |
64 paint.setStrokeWidth(SkIntToScalar(0)); | 64 paint.setStrokeWidth(SkIntToScalar(0)); |
65 paint.setShader(NULL); | 65 paint.setShader(NULL); |
66 paint.setStyle(SkPaint::kStroke_Style); | 66 paint.setStyle(SkPaint::kStroke_Style); |
67 paint.setColor(kBaseStroke); | 67 paint.setColor(kBaseStroke); |
68 canvas->sk_canvas()->drawCircle(radius, radius, radius, paint); | 68 canvas->sk_canvas()->drawCircle(radius, radius, radius, paint); |
69 | 69 |
70 if (selected_) { | 70 if (selected_) { |
71 SkPoint selected_gradient_points[2]; | 71 SkPoint selected_gradient_points[2]; |
72 selected_gradient_points[0].iset(0, 0); | 72 selected_gradient_points[0].iset(0, 0); |
73 selected_gradient_points[1].iset(0, kSelectedIndicatorSize); | 73 selected_gradient_points[1].iset(0, kSelectedIndicatorSize); |
74 SkColor selected_gradient_colors[2] = { kRadioButtonIndicatorGradient0, | 74 SkColor selected_gradient_colors[2] = { kRadioButtonIndicatorGradient0, |
75 kRadioButtonIndicatorGradient1 }; | 75 kRadioButtonIndicatorGradient1 }; |
76 shader = SkGradientShader::CreateLinear( | 76 shader = skia::AdoptRef( |
77 selected_gradient_points, selected_gradient_colors, NULL, | 77 SkGradientShader::CreateLinear( |
78 arraysize(selected_gradient_points), SkShader::kClamp_TileMode, NULL); | 78 selected_gradient_points, selected_gradient_colors, NULL, |
79 paint.setShader(shader); | 79 arraysize(selected_gradient_points), |
80 shader->unref(); | 80 SkShader::kClamp_TileMode, NULL)); |
| 81 paint.setShader(shader.get()); |
81 paint.setStyle(SkPaint::kFill_Style); | 82 paint.setStyle(SkPaint::kFill_Style); |
82 canvas->sk_canvas()->drawCircle(radius, radius, | 83 canvas->sk_canvas()->drawCircle(radius, radius, |
83 kSelectedIndicatorSize / 2, paint); | 84 kSelectedIndicatorSize / 2, paint); |
84 | 85 |
85 paint.setStrokeWidth(SkIntToScalar(0)); | 86 paint.setStrokeWidth(SkIntToScalar(0)); |
86 paint.setShader(NULL); | 87 paint.setShader(NULL); |
87 paint.setStyle(SkPaint::kStroke_Style); | 88 paint.setStyle(SkPaint::kStroke_Style); |
88 paint.setColor(kIndicatorStroke); | 89 paint.setColor(kIndicatorStroke); |
89 canvas->sk_canvas()->drawCircle(radius, radius, | 90 canvas->sk_canvas()->drawCircle(radius, radius, |
90 kSelectedIndicatorSize / 2, paint); | 91 kSelectedIndicatorSize / 2, paint); |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 return selected ? kRadioOn : kRadioOff; | 146 return selected ? kRadioOn : kRadioOff; |
146 } | 147 } |
147 | 148 |
148 const gfx::ImageSkia* GetSubmenuArrowImage() { | 149 const gfx::ImageSkia* GetSubmenuArrowImage() { |
149 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 150 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
150 return base::i18n::IsRTL() ? GetRtlSubmenuArrowImage() | 151 return base::i18n::IsRTL() ? GetRtlSubmenuArrowImage() |
151 : rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia(); | 152 : rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia(); |
152 } | 153 } |
153 | 154 |
154 } // namespace views | 155 } // namespace views |
OLD | NEW |