Rename paint data structures

chrome/browser/profiles/profile_avatar_icon_util.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 "chrome/browser/profiles/profile_avatar_icon_util.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "cc/paint/paint_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 152 matching lines @@
 
     // Offset the rectangle by a half pixel so the border is drawn within the
     // appropriate pixels no matter the scale factor. Subtract 1 from the right
     // and bottom sizes to specify the endpoints, yielding -0.5.
     SkPath path;
     path.addRect(SkFloatToScalar(x + 0.5f),  // left
                  SkFloatToScalar(y + 0.5f),  // top
                  SkFloatToScalar(x + border_size - 0.5f),   // right
                  SkFloatToScalar(y + border_size - 0.5f));  // bottom
 
-    SkPaint paint;
+    cc::PaintFlags paint;
     paint.setColor(border_color);
-    paint.setStyle(SkPaint::kStroke_Style);
+    paint.setStyle(cc::PaintFlags::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(1));
 
     canvas->DrawPath(path, paint);
   } else if (border_ == BORDER_ETCHED) {
     // Give the avatar an etched look by drawing a highlight on the bottom and
     // right edges.
     SkColor shadow_color = SkColorSetARGB(83, 0, 0, 0);
     SkColor highlight_color = SkColorSetARGB(96, 255, 255, 255);
 
-    SkPaint paint;
-    paint.setStyle(SkPaint::kStroke_Style);
+    cc::PaintFlags paint;
+    paint.setStyle(cc::PaintFlags::kStroke_Style);
     paint.setStrokeWidth(SkIntToScalar(1));
 
     SkPath path;
 
     // Left and top shadows. To support higher scale factors than 1, position
     // the orthogonal dimension of each line on the half-pixel to separate the
     // pixel. For a vertical line, this means adding 0.5 to the x-value.
     path.moveTo(SkFloatToScalar(x + 0.5f), SkIntToScalar(y + height_));
 
     // Draw up to the top-left. Stop with the y-value at a half-pixel.
@@ skipping 348 matching lines @@
     avatar_info->SetString(
         "label", l10n_util::GetStringUTF16(
                      profiles::GetDefaultAvatarLabelResourceIDAtIndex(i)));
 
     avatars->Append(std::move(avatar_info));
   }
   return avatars;
 }
 
 }  // namespace profiles