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

Unified Diff: ui/app_list/views/page_switcher.cc

Issue 2716213002: ui: Fix cc/paint skia type mismatches (Closed)
Patch Set: Created 3 years, 10 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
Index: ui/app_list/views/page_switcher.cc
diff --git a/ui/app_list/views/page_switcher.cc b/ui/app_list/views/page_switcher.cc
index 4950c00134db2ebdc73c5cb50025b3bb4d1e35b5..c6eed4ef6a875d68c669402b387ac12a5effd176 100644
--- a/ui/app_list/views/page_switcher.cc
+++ b/ui/app_list/views/page_switcher.cc
@@ -83,11 +83,11 @@ class PageSwitcherButton : public views::CustomButton {
SkIntToScalar(kButtonCornerRadius),
SkIntToScalar(kButtonCornerRadius));
- SkPaint paint;
- paint.setAntiAlias(true);
- paint.setStyle(SkPaint::kFill_Style);
- paint.setColor(base_color);
- canvas->DrawPath(path, paint);
+ cc::PaintFlags flags;
+ flags.setAntiAlias(true);
+ flags.setStyle(cc::PaintFlags::kFill_Style);
+ flags.setColor(base_color);
+ canvas->DrawPath(path, flags);
int selected_start_x = 0;
int selected_width = 0;
@@ -107,8 +107,8 @@ class PageSwitcherButton : public views::CustomButton {
selected_path.addRoundRect(gfx::RectToSkRect(selected_rect),
SkIntToScalar(kButtonCornerRadius),
SkIntToScalar(kButtonCornerRadius));
- paint.setColor(kPagerSelectedColor);
- canvas->DrawPath(selected_path, paint);
+ flags.setColor(kPagerSelectedColor);
+ canvas->DrawPath(selected_path, flags);
}
}

Powered by Google App Engine
This is Rietveld 408576698