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

Unified Diff: chrome/browser/ui/views/location_bar/background_with_1_px_border.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: three Rs: rebase, readme, review 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
Index: chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
diff --git a/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc b/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
index 82f522647e63a1d1f66e73e59c2b1cdf4f87a7df..ad0463e4391cc3805ce86025f9bc460c8a8ba54a 100644
--- a/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
+++ b/chrome/browser/ui/views/location_bar/background_with_1_px_border.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_flags.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/pathops/SkPathOps.h"
#include "ui/gfx/canvas.h"
@@ -40,8 +40,8 @@ void BackgroundWith1PxBorder::Paint(gfx::Canvas* canvas,
path.addRoundRect(gfx::RectFToSkRect(border_rect_f), scaled_corner_radius,
scaled_corner_radius);
- SkPaint paint;
- paint.setStyle(SkPaint::kStroke_Style);
+ cc::PaintFlags paint;
+ paint.setStyle(cc::PaintFlags::kStroke_Style);
paint.setStrokeWidth(1);
paint.setAntiAlias(true);
@@ -50,7 +50,7 @@ void BackgroundWith1PxBorder::Paint(gfx::Canvas* canvas,
SkPath fill_path;
Op(path, stroke_path, kDifference_SkPathOp, &fill_path);
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(cc::PaintFlags::kFill_Style);
paint.setColor(get_color());
canvas->sk_canvas()->drawPath(fill_path, paint);

Powered by Google App Engine
This is Rietveld 408576698