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

Unified Diff: ui/views/animation/ink_drop_mask.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/DEPS ('k') | ui/views/animation/ink_drop_painted_layer_delegates.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_mask.cc
diff --git a/ui/views/animation/ink_drop_mask.cc b/ui/views/animation/ink_drop_mask.cc
index 3e231bcd2f323a55cd828ea9ee32a2696ed1e2ff..a398136c278a57766ee02eec4350e6b9eba88631 100644
--- a/ui/views/animation/ink_drop_mask.cc
+++ b/ui/views/animation/ink_drop_mask.cc
@@ -4,7 +4,7 @@
#include "ui/views/animation/ink_drop_mask.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_flags.h"
#include "ui/compositor/paint_recorder.h"
#include "ui/gfx/canvas.h"
@@ -42,9 +42,9 @@ RoundRectInkDropMask::RoundRectInkDropMask(const gfx::Size& layer_size,
corner_radius_(corner_radius) {}
void RoundRectInkDropMask::OnPaintLayer(const ui::PaintContext& context) {
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAlpha(255);
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(cc::PaintFlags::kFill_Style);
paint.setAntiAlias(true);
ui::PaintRecorder recorder(context, layer()->size());
@@ -63,9 +63,9 @@ CircleInkDropMask::CircleInkDropMask(const gfx::Size& layer_size,
mask_radius_(mask_radius) {}
void CircleInkDropMask::OnPaintLayer(const ui::PaintContext& context) {
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAlpha(255);
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(cc::PaintFlags::kFill_Style);
paint.setAntiAlias(true);
ui::PaintRecorder recorder(context, layer()->size());
« no previous file with comments | « ui/views/DEPS ('k') | ui/views/animation/ink_drop_painted_layer_delegates.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698