ui: Clean up naming of paint-related identifiers

ui/views/animation/ink_drop_mask.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 "ui/views/animation/ink_drop_mask.h"
 
 #include "cc/paint/paint_flags.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 
@@ skipping 24 matching lines @@
 // RoundRectInkDropMask
 
 RoundRectInkDropMask::RoundRectInkDropMask(const gfx::Size& layer_size,
                                            const gfx::Insets& mask_insets,
                                            int corner_radius)
     : InkDropMask(layer_size),
       mask_insets_(mask_insets),
       corner_radius_(corner_radius) {}
 
 void RoundRectInkDropMask::OnPaintLayer(const ui::PaintContext& context) {
-  cc::PaintFlags paint;
-  paint.setAlpha(255);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setAlpha(255);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setAntiAlias(true);
 
   ui::PaintRecorder recorder(context, layer()->size());
   gfx::Rect bounds = layer()->bounds();
   bounds.Inset(mask_insets_);
-  recorder.canvas()->DrawRoundRect(bounds, corner_radius_, paint);
+  recorder.canvas()->DrawRoundRect(bounds, corner_radius_, flags);
 }
 
 // CircleInkDropMask
 
 CircleInkDropMask::CircleInkDropMask(const gfx::Size& layer_size,
                                      const gfx::Point& mask_center,
                                      int mask_radius)
     : InkDropMask(layer_size),
       mask_center_(mask_center),
       mask_radius_(mask_radius) {}
 
 void CircleInkDropMask::OnPaintLayer(const ui::PaintContext& context) {
-  cc::PaintFlags paint;
-  paint.setAlpha(255);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setAlpha(255);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setAntiAlias(true);
 
   ui::PaintRecorder recorder(context, layer()->size());
-  recorder.canvas()->DrawCircle(mask_center_, mask_radius_, paint);
+  recorder.canvas()->DrawCircle(mask_center_, mask_radius_, flags);
 }
 
 }  // namespace views