Rename paint data structures

cc/output/renderer_pixeltest.cc

Index: cc/output/renderer_pixeltest.cc
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index 9eeb98348241bc54f8718e1ce2f8cd9fd6af06ec..d50b010d44c9dc27fbf4d85a3f978d05a2e22393 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "cc/base/math_util.h"
 #include "cc/output/gl_renderer.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
@@ -949,11 +950,11 @@ TYPED_TEST(IntersectingQuadSoftwareTest, PictureQuads) {
                        this->quad_rect_.width() / 2,
                        this->quad_rect_.height() / 2);
 
-  SkPaint black_paint;
+  PaintFlags black_paint;
   black_paint.setColor(SK_ColorBLACK);
-  SkPaint blue_paint;
+  PaintFlags blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
-  SkPaint green_paint;
+  PaintFlags green_paint;
   green_paint.setColor(SK_ColorGREEN);
 
   std::unique_ptr<FakeRecordingSource> blue_recording =
@@ -1913,9 +1914,9 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad) {
   SkBitmap bitmap;
   bitmap.allocPixels(
       SkImageInfo::MakeN32Premul(mask_rect.width(), mask_rect.height()));
-  SkCanvas canvas(bitmap);
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
+  PaintCanvas canvas(bitmap);
+  PaintFlags paint;
+  paint.setStyle(PaintFlags::kStroke_Style);
   paint.setStrokeWidth(SkIntToScalar(4));
   paint.setColor(SK_ColorWHITE);
   canvas.clear(SK_ColorTRANSPARENT);
@@ -2006,9 +2007,9 @@ TYPED_TEST(RendererPixelTest, RenderPassAndMaskWithPartialQuad2) {
   SkBitmap bitmap;
   bitmap.allocPixels(
       SkImageInfo::MakeN32Premul(mask_rect.width(), mask_rect.height()));
-  SkCanvas canvas(bitmap);
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
+  PaintCanvas canvas(bitmap);
+  PaintFlags paint;
+  paint.setStyle(PaintFlags::kStroke_Style);
   paint.setStrokeWidth(SkIntToScalar(4));
   paint.setColor(SK_ColorWHITE);
   canvas.clear(SK_ColorTRANSPARENT);
@@ -2499,10 +2500,10 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadIdentityScale) {
 
   std::unique_ptr<FakeRecordingSource> blue_recording =
       FakeRecordingSource::CreateFilledRecordingSource(blue_rect.size());
-  SkPaint red_paint;
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   blue_recording->add_draw_rect_with_paint(blue_rect, red_paint);
-  SkPaint blue_paint;
+  PaintFlags blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   blue_recording->add_draw_rect_with_paint(blue_clip_rect, blue_paint);
   blue_recording->Rerecord();
@@ -2530,7 +2531,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadIdentityScale) {
   // One viewport-filling green quad.
   std::unique_ptr<FakeRecordingSource> green_recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
-  SkPaint green_paint;
+  PaintFlags green_paint;
   green_paint.setColor(SK_ColorGREEN);
   green_recording->add_draw_rect_with_paint(viewport, green_paint);
   green_recording->Rerecord();
@@ -2571,7 +2572,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadOpacity) {
   // One viewport-filling 0.5-opacity green quad.
   std::unique_ptr<FakeRecordingSource> green_recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
-  SkPaint green_paint;
+  PaintFlags green_paint;
   green_paint.setColor(SK_ColorGREEN);
   green_recording->add_draw_rect_with_paint(viewport, green_paint);
   green_recording->Rerecord();
@@ -2592,7 +2593,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadOpacity) {
   // One viewport-filling white quad.
   std::unique_ptr<FakeRecordingSource> white_recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
-  SkPaint white_paint;
+  PaintFlags white_paint;
   white_paint.setColor(SK_ColorWHITE);
   white_recording->add_draw_rect_with_paint(viewport, white_paint);
   white_recording->Rerecord();
@@ -2660,7 +2661,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadDisableImageFiltering) {
 
   std::unique_ptr<FakeRecordingSource> recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
-  SkPaint paint;
+  PaintFlags paint;
   paint.setFilterQuality(kLow_SkFilterQuality);
   recording->add_draw_image_with_paint(surface->makeImageSnapshot(),
                                        gfx::Point(), paint);
@@ -2709,7 +2710,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNearestNeighbor) {
 
   std::unique_ptr<FakeRecordingSource> recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
-  SkPaint paint;
+  PaintFlags paint;
   paint.setFilterQuality(kLow_SkFilterQuality);
   recording->add_draw_image_with_paint(surface->makeImageSnapshot(),
                                        gfx::Point(), paint);
@@ -2914,10 +2915,10 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNonIdentityScale) {
   std::unique_ptr<FakeRecordingSource> green_recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
 
-  SkPaint red_paint;
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   green_recording->add_draw_rect_with_paint(viewport, red_paint);
-  SkPaint green_paint;
+  PaintFlags green_paint;
   green_paint.setColor(SK_ColorGREEN);
   green_recording->add_draw_rect_with_paint(green_rect1, green_paint);
   green_recording->add_draw_rect_with_paint(green_rect2, green_paint);
@@ -2986,7 +2987,7 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNonIdentityScale) {
     recording->add_draw_rect_with_paint(iter.rect(), red_paint);
   }
 
-  SkPaint blue_paint;
+  PaintFlags blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
   recording->add_draw_rectf_with_paint(blue_layer_rect1, blue_paint);
   recording->add_draw_rectf_with_paint(blue_layer_rect2, blue_paint);
@@ -3206,8 +3207,8 @@ TEST_F(GLRendererPixelTest, TextureQuadBatching) {
   bitmap.allocPixels(
       SkImageInfo::MakeN32Premul(mask_rect.width(), mask_rect.height()));
   SkCanvas canvas(bitmap);
-  SkPaint paint;
-  paint.setStyle(SkPaint::kStroke_Style);
+  PaintFlags paint;
+  paint.setStyle(PaintFlags::kStroke_Style);
   paint.setStrokeWidth(SkIntToScalar(4));
   paint.setColor(SK_ColorGREEN);
   canvas.clear(SK_ColorWHITE);