Rename paint data structures

cc/playback/raster_source_unittest.cc

Index: cc/playback/raster_source_unittest.cc
diff --git a/cc/playback/raster_source_unittest.cc b/cc/playback/raster_source_unittest.cc
index 4467f2446be5f6c74b32e45987233e6b14f10a5b..af967d98a88ee1e3449b97b8b3872449f248bd80 100644
--- a/cc/playback/raster_source_unittest.cc
+++ b/cc/playback/raster_source_unittest.cc
@@ -27,13 +27,13 @@ TEST(RasterSourceTest, AnalyzeIsSolidUnscaled) {
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
-  SkPaint solid_paint;
+  PaintFlags solid_paint;
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
   SkColor color = SK_ColorTRANSPARENT;
-  SkPaint non_solid_paint;
+  PaintFlags non_solid_paint;
   bool is_solid_color = false;
   non_solid_paint.setColor(non_solid_color);
 
@@ -100,12 +100,12 @@ TEST(RasterSourceTest, AnalyzeIsSolidScaled) {
 
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
   SkColor color = SK_ColorTRANSPARENT;
-  SkPaint solid_paint;
+  PaintFlags solid_paint;
   bool is_solid_color = false;
   solid_paint.setColor(solid_color);
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
-  SkPaint non_solid_paint;
+  PaintFlags non_solid_paint;
   non_solid_paint.setColor(non_solid_color);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 400, 400),
@@ -253,7 +253,7 @@ TEST(RasterSourceTest, RasterFullContents) {
 
   // Because the caller sets content opaque, it also promises that it
   // has at least filled in layer_bounds opaquely.
-  SkPaint white_paint;
+  PaintFlags white_paint;
   white_paint.setColor(SK_ColorWHITE);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              white_paint);
@@ -283,7 +283,7 @@ TEST(RasterSourceTest, RasterFullContents) {
 
       SkBitmap bitmap;
       bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
-      SkCanvas canvas(bitmap);
+      PaintCanvas canvas(bitmap);
       canvas.clear(SK_ColorTRANSPARENT);
 
       raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect,
@@ -318,7 +318,7 @@ TEST(RasterSourceTest, RasterPartialContents) {
   recording_source->SetClearCanvasWithDebugColor(false);
 
   // First record everything as white.
-  SkPaint white_paint;
+  PaintFlags white_paint;
   white_paint.setColor(SK_ColorWHITE);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              white_paint);
@@ -332,7 +332,7 @@ TEST(RasterSourceTest, RasterPartialContents) {
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
-  SkCanvas canvas(bitmap);
+  PaintCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything white.
@@ -356,7 +356,7 @@ TEST(RasterSourceTest, RasterPartialContents) {
   }
 
   // Re-record everything as black.
-  SkPaint black_paint;
+  PaintFlags black_paint;
   black_paint.setColor(SK_ColorBLACK);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
                                              black_paint);
@@ -412,7 +412,7 @@ TEST(RasterSourceTest, RasterPartialClear) {
 
   // First record everything as white.
   const unsigned alpha_dark = 10u;
-  SkPaint white_paint;
+  PaintFlags white_paint;
   white_paint.setColor(SK_ColorWHITE);
   white_paint.setAlpha(alpha_dark);
   recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
@@ -427,7 +427,7 @@ TEST(RasterSourceTest, RasterPartialClear) {
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height());
-  SkCanvas canvas(bitmap);
+  PaintCanvas canvas(bitmap);
   canvas.clear(SK_ColorTRANSPARENT);
 
   // Playback the full rect which should make everything light gray (alpha=10).
@@ -510,7 +510,7 @@ TEST(RasterSourceTest, RasterContentsTransparent) {
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
-  SkCanvas canvas(bitmap);
+  PaintCanvas canvas(bitmap);
 
   raster->PlaybackToCanvas(&canvas, canvas_rect, canvas_rect, contents_scale,
                            RasterSource::PlaybackSettings());
@@ -552,7 +552,7 @@ TEST(RasterSourceTest, ImageHijackCanvasRespectsSharedCanvasTransform) {
                                    gfx::Point(0, 0));
 
   // 2. Cover everything in red.
-  SkPaint paint;
+  PaintFlags paint;
   paint.setColor(SK_ColorRED);
   recording_source->add_draw_rect_with_paint(gfx::Rect(size), paint);
 
@@ -579,7 +579,7 @@ TEST(RasterSourceTest, ImageHijackCanvasRespectsSharedCanvasTransform) {
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(size.width() * 0.5f, size.height() * 0.25f);
-  SkCanvas canvas(bitmap);
+  PaintCanvas canvas(bitmap);
   canvas.scale(0.5f, 0.25f);
 
   RasterSource::PlaybackSettings settings;