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

Unified Diff: ui/gfx/nine_image_painter.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/gfx/image/image_skia_operations.cc ('k') | ui/gfx/paint_throbber.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/nine_image_painter.cc
diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc
index 1f14f0eea5408ee9e86b82e398cc91cabd8690c9..60c8d021835ac8d18cdf8fc716480ac0fa09df9d 100644
--- a/ui/gfx/nine_image_painter.cc
+++ b/ui/gfx/nine_image_painter.cc
@@ -9,7 +9,7 @@
#include <limits>
#include "base/macros.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_flags.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkScalar.h"
#include "ui/gfx/canvas.h"
@@ -43,7 +43,7 @@ void Fill(Canvas* c,
int y,
int w,
int h,
- const SkPaint& paint) {
+ const cc::PaintFlags& paint) {
if (rep.is_null())
return;
c->DrawImageIntInPixel(rep, x, y, w, h, false, paint);
@@ -157,7 +157,7 @@ void NineImagePainter::Paint(Canvas* canvas,
int i4h =
std::max(height_in_pixels - i4y - std::min(std::min(i6h, i7h), i8h), 0);
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAlpha(alpha);
Fill(canvas, image_reps[4], i4x, i4y, i4w, i4h, paint);
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/gfx/paint_throbber.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698