Clean up naming of paint-related identifiers

content/browser/web_contents/aura/gesture_nav_simple.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 "content/browser/web_contents/aura/gesture_nav_simple.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "cc/paint/paint_flags.h"
@@ skipping 236 matching lines @@
   DCHECK(abort_progress_ == 0.f || state_ == State::ABORTING);
   DCHECK(complete_progress_ == 0.f || state_ == State::COMPLETING);
 
   ui::PaintRecorder recorder(context, painted_layer_->size());
   gfx::Canvas* canvas = recorder.canvas();
 
   gfx::PointF center_point(kMaxRippleBurstRadius, kMaxRippleBurstRadius);
   float progress = (1 - abort_progress_) * drag_progress_;
 
   // Draw the ripple.
-  cc::PaintFlags ripple_paint;
-  ripple_paint.setAntiAlias(true);
-  ripple_paint.setStyle(cc::PaintFlags::kFill_Style);
-  ripple_paint.setColor(kRippleColor);
+  cc::PaintFlags ripple_flags;
+  ripple_flags.setAntiAlias(true);
+  ripple_flags.setStyle(cc::PaintFlags::kFill_Style);
+  ripple_flags.setColor(kRippleColor);
   float ripple_radius;
   if (state_ == State::COMPLETING) {
     ripple_radius =
         kMaxRippleRadius +
         complete_progress_ * (kMaxRippleBurstRadius - kMaxRippleRadius);
   } else {
     ripple_radius =
         kBackgroundRadius + progress * (kMaxRippleRadius - kBackgroundRadius);
   }
-  canvas->DrawCircle(center_point, ripple_radius, ripple_paint);
+  canvas->DrawCircle(center_point, ripple_radius, ripple_flags);
 
   // Draw the arrow background circle with the shadow.
-  cc::PaintFlags bg_paint;
-  bg_paint.setAntiAlias(true);
-  bg_paint.setStyle(cc::PaintFlags::kFill_Style);
-  bg_paint.setColor(kBackgroundColor);
+  cc::PaintFlags bg_flags;
+  bg_flags.setAntiAlias(true);
+  bg_flags.setStyle(cc::PaintFlags::kFill_Style);
+  bg_flags.setColor(kBackgroundColor);
   gfx::ShadowValues shadow;
   shadow.emplace_back(gfx::Vector2d(0, kBgShadowOffsetY), kBgShadowBlurRadius,
                       kBgShadowColor);
-  bg_paint.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadow));
-  canvas->DrawCircle(center_point, kBackgroundRadius, bg_paint);
+  bg_flags.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadow));
+  canvas->DrawCircle(center_point, kBackgroundRadius, bg_flags);
 
   // Draw the arrow.
   float arrow_x = center_point.x() - kArrowSize / 2.f;
   float arrow_y = center_point.y() - kArrowSize / 2.f;
   // Calculate the offset for the arrow relative to its circular background.
   float arrow_x_offset =
       (1 - progress) * (-kBackgroundRadius + kArrowSize / 2.f);
   arrow_x += mode_ == OVERSCROLL_EAST ? arrow_x_offset : -arrow_x_offset;
   uint8_t arrow_alpha =
       static_cast<uint8_t>(std::min(0xFF, static_cast<int>(progress * 0xFF)));
@@ skipping 104 matching lines @@
   // affordance layer (e.g. when the navigated-to page is displayed while the
   // completion animation is in progress). So instead, it is installed on top of
   // the content window as its sibling. Note that the affordance itself makes
   // sure that its contents are clipped to the bounds given to it.
   ui::Layer* parent = window->layer()->parent();
   parent->Add(affordance_->root_layer());
   parent->StackAtTop(affordance_->root_layer());
 }
 
 }  // namespace content