cc: Clean up naming of paint-related identifiers

cc/tiles/tile_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
@@ skipping 1405 matching lines @@
   }
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, NoRasterTasksforSolidColorTiles) {
   gfx::Size size(10, 10);
   const gfx::Size layer_bounds(1000, 1000);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
-  PaintFlags solid_paint;
+  PaintFlags solid_flags;
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
-  solid_paint.setColor(solid_color);
-  recording_source->add_draw_rect_with_paint(gfx::Rect(layer_bounds),
-                                             solid_paint);
+  solid_flags.setColor(solid_color);
+  recording_source->add_draw_rect_with_flags(gfx::Rect(layer_bounds),
+                                             solid_flags);
 
   // Create non solid tile as well, otherwise tilings wouldnt be created.
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
-  PaintFlags non_solid_paint;
-  non_solid_paint.setColor(non_solid_color);
+  PaintFlags non_solid_flags;
+  non_solid_flags.setColor(non_solid_color);
 
-  recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 10, 10),
-                                             non_solid_paint);
+  recording_source->add_draw_rect_with_flags(gfx::Rect(0, 0, 10, 10),
+                                             non_solid_flags);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
   FakePictureLayerTilingClient tiling_client;
   tiling_client.SetTileSize(size);
 
   std::unique_ptr<PictureLayerImpl> layer_impl =
       PictureLayerImpl::Create(host_impl()->active_tree(), 1, false);
@@ skipping 180 matching lines @@
         SkSurface::MakeRasterN32Premul(size.width(), size.height());
     ASSERT_NE(surface, nullptr);
     surface->getCanvas()->clear(SK_ColorBLUE);
     sk_sp<SkImage> blue_image = surface->makeImageSnapshot();
 
     std::unique_ptr<FakeRecordingSource> recording_source =
         FakeRecordingSource::CreateFilledRecordingSource(size);
     recording_source->SetBackgroundColor(SK_ColorTRANSPARENT);
     recording_source->SetRequiresClear(true);
     recording_source->SetClearCanvasWithDebugColor(false);
-    PaintFlags paint;
-    paint.setColor(SK_ColorGREEN);
-    recording_source->add_draw_rect_with_paint(gfx::Rect(size), paint);
+    PaintFlags flags;
+    flags.setColor(SK_ColorGREEN);
+    recording_source->add_draw_rect_with_flags(gfx::Rect(size), flags);
     recording_source->add_draw_image(std::move(blue_image), gfx::Point());
     recording_source->Rerecord();
     scoped_refptr<RasterSource> raster =
         RasterSource::CreateFromRecordingSource(recording_source.get(), false);
 
     FakePictureLayerTilingClient tiling_client;
     tiling_client.SetTileSize(size);
 
     std::unique_ptr<PictureLayerImpl> layer =
         PictureLayerImpl::Create(host_impl()->active_tree(), 1, false);
@@ skipping 69 matching lines @@
 TEST_F(ActivationTasksDoNotBlockReadyToDrawTest,
        ActivationTasksDoNotBlockReadyToDraw) {
   const gfx::Size layer_bounds(1000, 1000);
 
   EXPECT_TRUE(host_impl()->use_gpu_rasterization());
 
   // Active tree has no non-solid tiles, so it will generate no tile tasks.
   std::unique_ptr<FakeRecordingSource> active_tree_recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
-  PaintFlags solid_paint;
+  PaintFlags solid_flags;
   SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
-  solid_paint.setColor(solid_color);
-  active_tree_recording_source->add_draw_rect_with_paint(
-      gfx::Rect(layer_bounds), solid_paint);
+  solid_flags.setColor(solid_color);
+  active_tree_recording_source->add_draw_rect_with_flags(
+      gfx::Rect(layer_bounds), solid_flags);
 
   active_tree_recording_source->Rerecord();
 
   // Pending tree has non-solid tiles, so it will generate tile tasks.
   std::unique_ptr<FakeRecordingSource> pending_tree_recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
-  PaintFlags non_solid_paint;
-  non_solid_paint.setColor(non_solid_color);
+  PaintFlags non_solid_flags;
+  non_solid_flags.setColor(non_solid_color);
 
-  pending_tree_recording_source->add_draw_rect_with_paint(
-      gfx::Rect(5, 5, 10, 10), non_solid_paint);
+  pending_tree_recording_source->add_draw_rect_with_flags(
+      gfx::Rect(5, 5, 10, 10), non_solid_flags);
   pending_tree_recording_source->Rerecord();
 
   scoped_refptr<RasterSource> active_tree_raster_source =
       RasterSource::CreateFromRecordingSource(
           active_tree_recording_source.get(), false);
   scoped_refptr<RasterSource> pending_tree_raster_source =
       RasterSource::CreateFromRecordingSource(
           pending_tree_recording_source.get(), false);
 
   SetupTrees(pending_tree_raster_source, active_tree_raster_source);
@@ skipping 216 matching lines @@
   void SetUp() override {
     TileManagerTest::SetUp();
     host_impl()->tile_manager()->SetRasterBufferProviderForTesting(
         &mock_raster_buffer_provider_);
 
     const gfx::Size layer_bounds(1000, 1000);
 
     solid_color_recording_source_ =
         FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
 
-    SkPaint solid_paint;
+    PaintFlags solid_flags;
     SkColor solid_color = SkColorSetARGB(255, 12, 23, 34);
-    solid_paint.setColor(solid_color);
-    solid_color_recording_source_->add_draw_rect_with_paint(
-        gfx::Rect(layer_bounds), solid_paint);
+    solid_flags.setColor(solid_color);
+    solid_color_recording_source_->add_draw_rect_with_flags(
+        gfx::Rect(layer_bounds), solid_flags);
 
     solid_color_recording_source_->Rerecord();
 
     recording_source_ =
         FakeRecordingSource::CreateFilledRecordingSource(layer_bounds);
     SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
-    SkPaint non_solid_paint;
-    non_solid_paint.setColor(non_solid_color);
+    PaintFlags non_solid_flags;
+    non_solid_flags.setColor(non_solid_color);
 
     for (int i = 0; i < 100; ++i) {
       for (int j = 0; j < 100; ++j) {
-        recording_source_->add_draw_rect_with_paint(
-            gfx::Rect(10 * i, 10 * j, 5, 5), non_solid_paint);
+        recording_source_->add_draw_rect_with_flags(
+            gfx::Rect(10 * i, 10 * j, 5, 5), non_solid_flags);
       }
     }
     recording_source_->Rerecord();
   }
 
   LayerTreeSettings CreateSettings() override {
     LayerTreeSettingsForTesting settings;
     settings.renderer_settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
@@ skipping 246 matching lines @@
         .WillOnce(Invoke([&run_loop]() { run_loop.Quit(); }));
     run_loop.Run();
   }
 
   EXPECT_TRUE(host_impl()->tile_manager()->IsReadyToDraw());
   EXPECT_TRUE(host_impl()->tile_manager()->IsReadyToActivate());
 }
 
 }  // namespace
 }  // namespace cc