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

Unified Diff: chrome/browser/chromeos/display/overscan_calibrator.cc

Issue 2717943002: Fix cc/paint skia type mismatches (Closed)
Patch Set: Rebase 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: chrome/browser/chromeos/display/overscan_calibrator.cc
diff --git a/chrome/browser/chromeos/display/overscan_calibrator.cc b/chrome/browser/chromeos/display/overscan_calibrator.cc
index 9d9ccf5cfd9f900f36ee2e9d0aba7c73253e9b78..0cc03f7f95adcc4fb45b6df73f168f7ca66836fd 100644
--- a/chrome/browser/chromeos/display/overscan_calibrator.cc
+++ b/chrome/browser/chromeos/display/overscan_calibrator.cc
@@ -39,13 +39,13 @@ void DrawTriangle(int x_offset,
double rotation_degree,
gfx::Canvas* canvas) {
// Draw triangular arrows.
- SkPaint content_paint;
- content_paint.setStyle(SkPaint::kFill_Style);
- content_paint.setColor(SkColorSetA(
+ cc::PaintFlags content_flags;
+ content_flags.setStyle(cc::PaintFlags::kFill_Style);
+ content_flags.setColor(SkColorSetA(
SK_ColorBLACK, std::numeric_limits<uint8_t>::max() * kArrowOpacity));
- SkPaint border_paint;
- border_paint.setStyle(SkPaint::kStroke_Style);
- border_paint.setColor(SkColorSetA(
+ cc::PaintFlags border_flags;
+ border_flags.setStyle(cc::PaintFlags::kStroke_Style);
+ border_flags.setColor(SkColorSetA(
SK_ColorWHITE, std::numeric_limits<uint8_t>::max() * kArrowOpacity));
SkPath base_path;
@@ -64,8 +64,8 @@ void DrawTriangle(int x_offset,
rotate_transform.ConcatTransform(move_transform);
base_path.transform(rotate_transform.matrix(), &path);
- canvas->DrawPath(path, content_paint);
- canvas->DrawPath(path, border_paint);
+ canvas->DrawPath(path, content_flags);
+ canvas->DrawPath(path, border_flags);
}
} // namespace
« no previous file with comments | « ash/common/wm/overview/window_grid.cc ('k') | chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698