Clean up naming of paint-related identifiers

chrome/browser/ui/views/tabs/tab_strip.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab_strip.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 384 matching lines @@
   // We want to draw a drop shadow either inside or outside the stroke,
   // depending on whether we're pressed; so, either clip out what's outside
   // the stroke, or clip out the fill inside it.
   if (pressed)
     canvas->ClipPath(stroke, true);
   Op(stroke, fill, kDifference_SkPathOp, &stroke);
   if (!pressed)
     canvas->sk_canvas()->clipPath(fill, SkClipOp::kDifference, true);
   // Now draw the stroke and shadow; the stroke will always be visible, while
   // the shadow will be affected by the clip we set above.
-  cc::PaintFlags paint;
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setAntiAlias(true);
   const SkColor stroke_color = tab_strip_->GetToolbarTopSeparatorColor();
   const float alpha = SkColorGetA(stroke_color);
   const SkAlpha shadow_alpha =
       base::saturated_cast<SkAlpha>(std::round(2.1875f * alpha));
-  paint.setLooper(
+  flags.setLooper(
       CreateShadowDrawLooper(SkColorSetA(stroke_color, shadow_alpha)));
   const SkAlpha path_alpha = static_cast<SkAlpha>(
       std::round((pressed ? 0.875f : 0.609375f) * alpha));
-  paint.setColor(SkColorSetA(stroke_color, path_alpha));
-  canvas->DrawPath(stroke, paint);
+  flags.setColor(SkColorSetA(stroke_color, path_alpha));
+  canvas->DrawPath(stroke, flags);
 }
 
 bool NewTabButton::GetHitTestMask(gfx::Path* mask) const {
   DCHECK(mask);
 
   SkPath border;
   const float scale = GetWidget()->GetCompositor()->device_scale_factor();
   GetBorderPath(GetNewTabButtonTopOffset() * scale, scale,
                 tab_strip_->SizeTabButtonToTopOfTabStrip(), &border);
   mask->addPath(border, SkMatrix::MakeScale(1 / scale));
@@ skipping 38 matching lines @@
   }
   path->close();
 }
 
 void NewTabButton::PaintFill(bool pressed,
                              float scale,
                              const SkPath& fill,
                              gfx::Canvas* canvas) const {
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->UndoDeviceScaleFactor();
-  cc::PaintFlags paint;
-  paint.setAntiAlias(true);
+  cc::PaintFlags flags;
+  flags.setAntiAlias(true);
 
   // For unpressed buttons, draw the fill and its shadow.
   if (!pressed) {
     // First we compute the background image coordinates and scale, in case we
     // need to draw a custom background image.
     const ui::ThemeProvider* tp = GetThemeProvider();
     bool custom_image;
     const int bg_id = tab_strip_->GetBackgroundResourceId(&custom_image);
     if (custom_image) {
       // For custom tab backgrounds the background starts at the top of the tab
       // strip. Otherwise the background starts at the top of the frame.
       const int offset_y =
           tp->HasCustomImage(bg_id) ? 0 : background_offset_.y();
       // The new tab background is mirrored in RTL mode, but the theme
       // background should never be mirrored. Mirror it here to compensate.
       float x_scale = 1.0f;
       int x = GetMirroredX() + background_offset_.x();
       const gfx::Size size(GetLayoutSize(NEW_TAB_BUTTON));
       if (base::i18n::IsRTL()) {
         x_scale = -1.0f;
         // Offset by |width| such that the same region is painted as if there
         // was no flip.
         x += size.width();
       }
 
       const bool succeeded =
           canvas->InitPaintFlagsForTiling(*tp->GetImageSkiaNamed(bg_id), x,
                                           GetNewTabButtonTopOffset() + offset_y,
-                                          x_scale * scale, scale, 0, 0, &paint);
+                                          x_scale * scale, scale, 0, 0, &flags);
       DCHECK(succeeded);
     } else {
-      paint.setColor(tp->GetColor(ThemeProperties::COLOR_BACKGROUND_TAB));
+      flags.setColor(tp->GetColor(ThemeProperties::COLOR_BACKGROUND_TAB));
     }
     const SkColor stroke_color = tab_strip_->GetToolbarTopSeparatorColor();
     const SkAlpha alpha = static_cast<SkAlpha>(
         std::round(SkColorGetA(stroke_color) * 0.59375f));
-    cc::PaintFlags shadow_paint = paint;
-    shadow_paint.setLooper(
+    cc::PaintFlags shadow_flags = flags;
+    shadow_flags.setLooper(
         CreateShadowDrawLooper(SkColorSetA(stroke_color, alpha)));
-    canvas->DrawPath(fill, shadow_paint);
+    canvas->DrawPath(fill, shadow_flags);
   }
 
   // Draw a white highlight on hover.
   const SkAlpha hover_alpha = static_cast<SkAlpha>(
       hover_animation().CurrentValueBetween(0x00, 0x4D));
   if (hover_alpha != SK_AlphaTRANSPARENT) {
-    paint.setColor(SkColorSetA(SK_ColorWHITE, hover_alpha));
-    canvas->DrawPath(fill, paint);
+    flags.setColor(SkColorSetA(SK_ColorWHITE, hover_alpha));
+    canvas->DrawPath(fill, flags);
   }
 
   // Most states' opacities are adjusted using an opacity recorder in
   // TabStrip::PaintChildren(), but the pressed state is excluded there and
   // instead rendered using a dark overlay here.  Avoiding the use of the
   // opacity recorder keeps the stroke more visible in this state.
   if (pressed) {
-    paint.setColor(SkColorSetA(SK_ColorBLACK, 0x14));
-    canvas->DrawPath(fill, paint);
+    flags.setColor(SkColorSetA(SK_ColorBLACK, 0x14));
+    canvas->DrawPath(fill, flags);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip::RemoveTabDelegate
 //
 // AnimationDelegate used when removing a tab. Does the necessary cleanup when
 // done.
 class TabStrip::RemoveTabDelegate : public TabAnimationDelegate {
  public:
@@ skipping 2259 matching lines @@
           ConvertPointToViewAndGetEventHandler(this, newtab_button_, point);
       if (view)
         return view;
     }
     Tab* tab = FindTabForEvent(point);
     if (tab)
       return ConvertPointToViewAndGetEventHandler(this, tab, point);
   }
   return this;
 }