components: Clean up naming of paint-related identifiers

components/test_runner/pixel_dump.cc

 // Copyright 2016 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 "components/test_runner/pixel_dump.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 60 matching lines @@
   // See if we need to draw the selection bounds rect. Selection bounds
   // rect is the rect enclosing the (possibly transformed) selection.
   // The rect should be drawn after everything is laid out and painted.
   if (!dump_request.layout_test_runtime_flags.dump_selection_rect())
     return;
   // If there is a selection rect - draw a red 1px border enclosing rect
   blink::WebRect wr = dump_request.web_view->mainFrame()->selectionBoundsRect();
   if (wr.isEmpty())
     return;
   // Render a red rectangle bounding selection rect
-  cc::PaintFlags paint;
-  paint.setColor(0xFFFF0000);  // Fully opaque red
-  paint.setStyle(cc::PaintFlags::kStroke_Style);
-  paint.setAntiAlias(true);
-  paint.setStrokeWidth(1.0f);
+  cc::PaintFlags flags;
+  flags.setColor(0xFFFF0000);  // Fully opaque red
+  flags.setStyle(cc::PaintFlags::kStroke_Style);
+  flags.setAntiAlias(true);
+  flags.setStrokeWidth(1.0f);
   SkIRect rect;  // Bounding rect
   rect.set(wr.x, wr.y, wr.x + wr.width, wr.y + wr.height);
-  canvas->drawIRect(rect, paint);
+  canvas->drawIRect(rect, flags);
 }
 
 void CapturePixelsForPrinting(std::unique_ptr<PixelsDumpRequest> dump_request) {
   dump_request->web_view->updateAllLifecyclePhases();
 
   blink::WebSize page_size_in_pixels = dump_request->web_view->size();
   blink::WebFrame* web_frame = dump_request->web_view->mainFrame();
 
   int page_count = web_frame->printBegin(page_size_in_pixels);
   int totalHeight = page_count * (page_size_in_pixels.height + 1) - 1;
@@ skipping 104 matching lines @@
 
   blink::WebImage image = static_cast<blink::WebMockClipboard*>(
                               blink::Platform::current()->clipboard())
                               ->readRawImage(blink::WebClipboard::Buffer());
   const SkBitmap& bitmap = image.getSkBitmap();
   SkAutoLockPixels autoLock(bitmap);
   callback.Run(bitmap);
 }
 
 }  // namespace test_runner