ash: Clean up naming of paint-related identifiers

ash/touch_hud/touch_hud_renderer.cc

 // Copyright 2013 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/touch_hud/touch_hud_renderer.h"
 
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_owner.h"
 #include "ui/events/event.h"
@@ skipping 22 matching lines @@
                        public views::WidgetObserver {
  public:
   explicit TouchPointView(views::Widget* parent_widget)
       : circle_center_(kPointRadius + 1, kPointRadius + 1),
         gradient_center_(SkPoint::Make(kPointRadius + 1, kPointRadius + 1)) {
     SetPaintToLayer();
     layer()->SetFillsBoundsOpaquely(false);
 
     SetSize(gfx::Size(2 * kPointRadius + 2, 2 * kPointRadius + 2));
 
-    stroke_paint_.setStyle(cc::PaintFlags::kStroke_Style);
-    stroke_paint_.setColor(kProjectionStrokeColor);
+    stroke_flags_.setStyle(cc::PaintFlags::kStroke_Style);
+    stroke_flags_.setColor(kProjectionStrokeColor);
 
     gradient_colors_[0] = kProjectionFillColor;
     gradient_colors_[1] = kProjectionStrokeColor;
 
     gradient_pos_[0] = SkFloatToScalar(0.9f);
     gradient_pos_[1] = SkFloatToScalar(1.0f);
 
     parent_widget->GetContentsView()->AddChildView(this);
 
     parent_widget->AddObserver(this);
@@ skipping 20 matching lines @@
   ~TouchPointView() override {
     GetWidget()->RemoveObserver(this);
     parent()->RemoveChildView(this);
   }
 
   // Overridden from views::View.
   void OnPaint(gfx::Canvas* canvas) override {
     int alpha = kProjectionAlpha;
     if (fadeout_)
       alpha = static_cast<int>(fadeout_->CurrentValueBetween(alpha, 0));
-    fill_paint_.setAlpha(alpha);
-    stroke_paint_.setAlpha(alpha);
-    fill_paint_.setShader(SkGradientShader::MakeRadial(
+    fill_flags_.setAlpha(alpha);
+    stroke_flags_.setAlpha(alpha);
+    fill_flags_.setShader(SkGradientShader::MakeRadial(
         gradient_center_, SkIntToScalar(kPointRadius), gradient_colors_,
         gradient_pos_, arraysize(gradient_colors_),
         SkShader::kMirror_TileMode));
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
-                       fill_paint_);
+                       fill_flags_);
     canvas->DrawCircle(circle_center_, SkIntToScalar(kPointRadius),
-                       stroke_paint_);
+                       stroke_flags_);
   }
 
   // Overridden from gfx::AnimationDelegate.
   void AnimationEnded(const gfx::Animation* animation) override {
     DCHECK_EQ(fadeout_.get(), animation);
     delete this;
   }
 
   void AnimationProgressed(const gfx::Animation* animation) override {
     DCHECK_EQ(fadeout_.get(), animation);
     SchedulePaint();
   }
 
   void AnimationCanceled(const gfx::Animation* animation) override {
     AnimationEnded(animation);
   }
 
   // Overridden from views::WidgetObserver.
   void OnWidgetDestroying(views::Widget* widget) override {
     if (fadeout_)
       fadeout_->Stop();
     else
       Destroy();
   }
 
   const gfx::Point circle_center_;
   const SkPoint gradient_center_;
 
-  cc::PaintFlags fill_paint_;
-  cc::PaintFlags stroke_paint_;
+  cc::PaintFlags fill_flags_;
+  cc::PaintFlags stroke_flags_;
   SkColor gradient_colors_[2];
   SkScalar gradient_pos_[2];
 
   std::unique_ptr<gfx::Animation> fadeout_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchPointView);
 };
 
 TouchHudRenderer::TouchHudRenderer(views::Widget* parent_widget)
     : parent_widget_(parent_widget) {}
@@ skipping 36 matching lines @@
       if (event.type() == ui::ET_TOUCH_RELEASED ||
           event.type() == ui::ET_TOUCH_CANCELLED ||
           event.type() == ui::ET_POINTER_UP ||
           event.type() == ui::ET_POINTER_CANCELLED)
         points_.erase(iter);
     }
   }
 }
 
 }  // namespace ash