Rename paint data structures

ash/touch/touch_hud_debug.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/touch_hud_debug.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 223 matching lines @@
 };
 
 // TouchHudCanvas draws touch traces in |FULLSCREEN| and |REDUCED_SCALE| modes.
 class TouchHudCanvas : public views::View {
  public:
   explicit TouchHudCanvas(const TouchLog& touch_log)
       : touch_log_(touch_log), scale_(1) {
     SetPaintToLayer();
     layer()->SetFillsBoundsOpaquely(false);
 
-    paint_.setStyle(SkPaint::kFill_Style);
+    paint_.setStyle(cc::PaintFlags::kFill_Style);
   }
 
   ~TouchHudCanvas() override {}
 
   void SetScale(int scale) {
     if (scale_ == scale)
       return;
     scale_ = scale;
     gfx::Transform transform;
     transform.Scale(1. / scale_, 1. / scale_);
@@ skipping 42 matching lines @@
   // Overridden from views::View.
   void OnPaint(gfx::Canvas* canvas) override {
     for (int i = 0; i < kMaxPaths; ++i) {
       if (paths_[i].countPoints() == 0)
         continue;
       paint_.setColor(colors_[i]);
       canvas->DrawPath(paths_[i], paint_);
     }
   }
 
-  SkPaint paint_;
+  cc::PaintFlags paint_;

[sky, 2017/01/26 23:00:13]

If PaintFlags is going to be the final name, then I suggest renaming member
variables to match, e.g. paint_flags_.

 
   const TouchLog& touch_log_;
   SkPath paths_[kMaxPaths];
   SkColor colors_[kMaxPaths];
 
   int scale_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudCanvas);
 };
 
@@ skipping 145 matching lines @@
     RootWindowController* controller) {
   controller->set_touch_hud_debug(this);
 }
 
 void TouchHudDebug::UnsetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(NULL);
 }
 
 }  // namespace ash