cc: Clean up naming of paint-related identifiers

cc/trees/layer_tree_host_pixeltest_masks.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 "build/build_config.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_image_layer.h"
 #include "cc/layers/picture_layer.h"
@@ skipping 25 matching lines @@
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
 
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
 
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     PaintRecorder recorder;
     PaintCanvas* canvas =
         recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
-    PaintFlags paint;
-    paint.setStyle(PaintFlags::kStroke_Style);
-    paint.setStrokeWidth(SkIntToScalar(2));
-    paint.setColor(SK_ColorWHITE);
+    PaintFlags flags;
+    flags.setStyle(PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(SkIntToScalar(2));
+    flags.setColor(SK_ColorWHITE);
 
     canvas->clear(SK_ColorTRANSPARENT);
     gfx::Rect inset_rect(bounds_);
     while (!inset_rect.IsEmpty()) {
       inset_rect.Inset(3, 3, 2, 2);
       canvas->drawRect(
-          SkRect::MakeXYWH(inset_rect.x(), inset_rect.y(),
-                           inset_rect.width(), inset_rect.height()),
-          paint);
+          SkRect::MakeXYWH(inset_rect.x(), inset_rect.y(), inset_rect.width(),
+                           inset_rect.height()),
+          flags);
       inset_rect.Inset(3, 3, 2, 2);
     }
 
     auto display_list = make_scoped_refptr(new DisplayItemList);
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         PaintableRegion(), recorder.finishRecordingAsPicture());
 
     display_list->Finalize();
     return display_list;
   }
@@ skipping 89 matching lines @@
   ~CheckerContentLayerClient() override {}
   bool FillsBoundsCompletely() const override { return false; }
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     PaintRecorder recorder;
     PaintCanvas* canvas =
         recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
-    PaintFlags paint;
-    paint.setStyle(PaintFlags::kStroke_Style);
-    paint.setStrokeWidth(SkIntToScalar(4));
-    paint.setColor(color_);
+    PaintFlags flags;
+    flags.setStyle(PaintFlags::kStroke_Style);
+    flags.setStrokeWidth(SkIntToScalar(4));
+    flags.setColor(color_);
     canvas->clear(SK_ColorTRANSPARENT);
     if (vertical_) {
       for (int i = 4; i < bounds_.width(); i += 16) {
-        canvas->drawLine(i, 0, i, bounds_.height(), paint);
+        canvas->drawLine(i, 0, i, bounds_.height(), flags);
       }
     } else {
       for (int i = 4; i < bounds_.height(); i += 16) {
-        canvas->drawLine(0, i, bounds_.width(), i, paint);
+        canvas->drawLine(0, i, bounds_.width(), i, flags);
       }
     }
 
     auto display_list = make_scoped_refptr(new DisplayItemList);
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         PaintableRegion(), recorder.finishRecordingAsPicture());
 
     display_list->Finalize();
     return display_list;
   }
@@ skipping 11 matching lines @@
   ~CircleContentLayerClient() override {}
   bool FillsBoundsCompletely() const override { return false; }
   size_t GetApproximateUnsharedMemoryUsage() const override { return 0; }
   gfx::Rect PaintableRegion() override { return gfx::Rect(bounds_); }
   scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
       PaintingControlSetting picture_control) override {
     PaintRecorder recorder;
     PaintCanvas* canvas =
         recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(bounds_)));
 
-    PaintFlags paint;
-    paint.setStyle(PaintFlags::kFill_Style);
-    paint.setColor(SK_ColorWHITE);
+    PaintFlags flags;
+    flags.setStyle(PaintFlags::kFill_Style);
+    flags.setColor(SK_ColorWHITE);
     canvas->clear(SK_ColorTRANSPARENT);
-    canvas->drawCircle(bounds_.width() / 2,
-                       bounds_.height() / 2,
-                       bounds_.width() / 4,
-                       paint);
+    canvas->drawCircle(bounds_.width() / 2, bounds_.height() / 2,
+                       bounds_.width() / 4, flags);
 
     auto display_list = make_scoped_refptr(new DisplayItemList);
     display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         PaintableRegion(), recorder.finishRecordingAsPicture());
 
     display_list->Finalize();
     return display_list;
   }
 
  private:
@@ skipping 108 matching lines @@
 
   RunPixelResourceTest(background,
                        base::FilePath(
                            FILE_PATH_LITERAL("mask_of_layer_with_blend.png")));
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)