Rename paint data structures

ui/gfx/paint_vector_icon.cc

 // Copyright 2015 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 "ui/gfx/paint_vector_icon.h"
 
 #include <map>
 #include <tuple>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/vector_icon_types.h"
 #include "ui/gfx/vector_icons_public.h"
 
 namespace gfx {
 
 namespace {
@@ skipping 55 matching lines @@
 
 void PaintPath(Canvas* canvas,
                const PathElement* path_elements,
                int dip_size,
                SkColor color) {
   SkPath path;
   path.setFillType(SkPath::kEvenOdd_FillType);
 
   int canvas_size = kReferenceSizeDip;
   std::vector<SkPath> paths;
-  std::vector<SkPaint> paints;
+  std::vector<cc::PaintFlags> paints;
   SkRect clip_rect = SkRect::MakeEmpty();
   bool flips_in_rtl = false;
   CommandType previous_command_type = NEW_PATH;
 
   for (size_t i = 0; path_elements[i].type != END; i++) {
     if (paths.empty() || path_elements[i].type == NEW_PATH) {
       paths.push_back(SkPath());
       paths.back().setFillType(SkPath::kEvenOdd_FillType);
 
-      paints.push_back(SkPaint());
+      paints.push_back(cc::PaintFlags());
       paints.back().setColor(color);
       paints.back().setAntiAlias(true);
-      paints.back().setStrokeCap(SkPaint::kRound_Cap);
+      paints.back().setStrokeCap(cc::PaintFlags::kRound_Cap);
     }
 
     SkPath& path = paths.back();
-    SkPaint& paint = paints.back();
+    cc::PaintFlags& paint = paints.back();
     CommandType command_type = path_elements[i].type;
     switch (command_type) {
       // Handled above.
       case NEW_PATH:
         continue;
 
       case PATH_COLOR_ARGB: {
         int a = SkScalarFloorToInt(path_elements[++i].arg);
         int r = SkScalarFloorToInt(path_elements[++i].arg);
         int g = SkScalarFloorToInt(path_elements[++i].arg);
         int b = SkScalarFloorToInt(path_elements[++i].arg);
         paint.setColor(SkColorSetARGB(a, r, g, b));
         break;
       }
 
       case PATH_MODE_CLEAR: {
         paint.setBlendMode(SkBlendMode::kClear);
         break;
       };
 
       case STROKE: {
-        paint.setStyle(SkPaint::kStroke_Style);
+        paint.setStyle(cc::PaintFlags::kStroke_Style);
         SkScalar width = path_elements[++i].arg;
         paint.setStrokeWidth(width);
         break;
       }
 
       case CAP_SQUARE: {
-        paint.setStrokeCap(SkPaint::kSquare_Cap);
+        paint.setStrokeCap(cc::PaintFlags::kSquare_Cap);
         break;
       }
 
       case MOVE_TO: {
         SkScalar x = path_elements[++i].arg;
         SkScalar y = path_elements[++i].arg;
         path.moveTo(x, y);
         break;
       }
 
@@ skipping 445 matching lines @@
 }
 
 ImageSkia CreateVectorIconFromSource(const std::string& source,
                                      int dip_size,
                                      SkColor color) {
   return CanvasImageSource::MakeImageSkia<VectorIconSourceLegacy>(
       source, dip_size, color);
 }
 
 }  // namespace gfx