ash: Clean up naming of paint-related identifiers

ash/common/frame/default_header_painter.cc

 // Copyright 2014 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 "ash/common/frame/default_header_painter.h"
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/header_painter_util.h"
 #include "ash/resources/vector_icons/vector_icons.h"
@@ skipping 26 matching lines @@
 // Color of the inactive window header/content separator line.
 const SkColor kHeaderContentSeparatorInactiveColor =
     SkColorSetRGB(180, 180, 182);
 // The default color of the frame.
 const SkColor kDefaultFrameColor = SkColorSetRGB(242, 242, 242);
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
 
 // Tiles an image into an area, rounding the top corners.
 void TileRoundRect(gfx::Canvas* canvas,
-                   const cc::PaintFlags& paint,
+                   const cc::PaintFlags& flags,
                    const gfx::Rect& bounds,
                    int corner_radius) {
   SkRect rect = gfx::RectToSkRect(bounds);
   const SkScalar corner_radius_scalar = SkIntToScalar(corner_radius);
   SkScalar radii[8] = {corner_radius_scalar,
                        corner_radius_scalar,  // top-left
                        corner_radius_scalar,
                        corner_radius_scalar,  // top-right
                        0,
                        0,  // bottom-right
                        0,
                        0};  // bottom-left
   SkPath path;
   path.addRoundRect(rect, radii, SkPath::kCW_Direction);
-  canvas->DrawPath(path, paint);
+  canvas->DrawPath(path, flags);
 }
 
 // Returns the FontList to use for the title.
 const gfx::FontList& GetTitleFontList() {
   static const gfx::FontList* title_font_list =
       new gfx::FontList(views::NativeWidgetAura::GetWindowTitleFontList());
   ANNOTATE_LEAKING_OBJECT_PTR(title_font_list);
   return *title_font_list;
 }
 
@@ skipping 58 matching lines @@
       else
         activation_animation_->Reset(0);
     }
     initial_paint_ = false;
   }
 
   int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen())
                           ? 0
                           : HeaderPainterUtil::GetTopCornerRadiusWhenRestored();
 
-  cc::PaintFlags paint;
+  cc::PaintFlags flags;
   int active_alpha = activation_animation_->CurrentValueBetween(0, 255);
-  paint.setColor(color_utils::AlphaBlend(active_frame_color_,
+  flags.setColor(color_utils::AlphaBlend(active_frame_color_,
                                          inactive_frame_color_, active_alpha));
-  paint.setAntiAlias(true);
-  TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius);
+  flags.setAntiAlias(true);
+  TileRoundRect(canvas, flags, GetLocalBounds(), corner_radius);
 
   if (!frame_->IsMaximized() && !frame_->IsFullscreen() &&
       mode_ == MODE_INACTIVE && !UsesCustomFrameColors()) {
     PaintHighlightForInactiveRestoredWindow(canvas);
   }
   if (frame_->widget_delegate()->ShouldShowWindowTitle())
     PaintTitleBar(canvas);
   if (!UsesCustomFrameColors())
     PaintHeaderContentSeparator(canvas);
 }
@@ skipping 105 matching lines @@
   title_bounds.set_x(view_->GetMirroredXForRect(title_bounds));
   canvas->DrawStringRectWithFlags(
       frame_->widget_delegate()->GetWindowTitle(), GetTitleFontList(),
       kTitleTextColor, title_bounds, gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
   gfx::RectF rect(0, painted_height_ * scale - 1, view_->width() * scale, 1);
-  cc::PaintFlags paint;
-  paint.setColor((mode_ == MODE_ACTIVE) ? kHeaderContentSeparatorColor
+  cc::PaintFlags flags;
+  flags.setColor((mode_ == MODE_ACTIVE) ? kHeaderContentSeparatorColor
                                         : kHeaderContentSeparatorInactiveColor);
-  canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint);
+  canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), flags);
 }
 
 bool DefaultHeaderPainter::ShouldUseLightImages() {
   return color_utils::IsDark(mode_ == MODE_INACTIVE ? inactive_frame_color_
                                                     : active_frame_color_);
 }
 
 void DefaultHeaderPainter::UpdateAllButtonImages() {
   caption_button_container_->SetUseLightImages(ShouldUseLightImages());
   caption_button_container_->SetButtonImage(CAPTION_BUTTON_ICON_MINIMIZE,
@@ skipping 27 matching lines @@
   return HeaderPainterUtil::GetTitleBounds(
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
   return active_frame_color_ != kDefaultFrameColor ||
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
 }  // namespace ash