Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: ui/views/controls/button/toggle_button.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/radio_button.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/toggle_button.cc
diff --git a/ui/views/controls/button/toggle_button.cc b/ui/views/controls/button/toggle_button.cc
index 349acde543d039138a68afea47b172976782df1a..0e39d93a40b955909352a0ca566550fe5b1c9fe7 100644
--- a/ui/views/controls/button/toggle_button.cc
+++ b/ui/views/controls/button/toggle_button.cc
@@ -4,8 +4,8 @@
#include "ui/views/controls/button/toggle_button.h"
+#include "cc/paint/paint_flags.h"
#include "third_party/skia/include/core/SkDrawLooper.h"
-#include "third_party/skia/include/core/SkPaint.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_palette.h"
@@ -78,7 +78,7 @@ class ToggleButton::ThumbView : public InkDropHostView {
ui::NativeTheme::kColorId_LabelEnabledColor),
0x99));
shadows.push_back(shadow.Scale(dsf));
- SkPaint thumb_paint;
+ cc::PaintFlags thumb_paint;
thumb_paint.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadows));
thumb_paint.setAntiAlias(true);
const SkColor thumb_on_color = GetNativeTheme()->GetSystemColor(
@@ -197,7 +197,7 @@ void ToggleButton::OnPaint(gfx::Canvas* canvas) {
gfx::RectF track_rect(GetTrackBounds());
track_rect.Scale(dsf);
track_rect = gfx::RectF(gfx::ToEnclosingRect(track_rect));
- SkPaint track_paint;
+ cc::PaintFlags track_paint;
track_paint.setAntiAlias(true);
const double color_ratio = slide_animation_.GetCurrentValue();
track_paint.setColor(color_utils::AlphaBlend(
« no previous file with comments | « ui/views/controls/button/radio_button.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698