Rename paint data structures

ui/views/border.cc

 // Copyright (c) 2012 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/views/border.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_flags.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 namespace {
 
 // A simple border with different thicknesses on each side and single color.
@@ skipping 58 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(RoundedRectBorder);
 };
 
 RoundedRectBorder::RoundedRectBorder(int thickness,
                                      int corner_radius,
                                      SkColor color)
     : thickness_(thickness), corner_radius_(corner_radius), color_(color) {}
 
 void RoundedRectBorder::Paint(const View& view, gfx::Canvas* canvas) {
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setStrokeWidth(thickness_);
   paint.setColor(color_);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   paint.setAntiAlias(true);
 
   float half_thickness = thickness_ / 2.0f;
   gfx::RectF bounds(view.GetLocalBounds());
   bounds.Inset(half_thickness, half_thickness);
   canvas->DrawRoundRect(bounds, corner_radius_, paint);
 }
 
 gfx::Insets RoundedRectBorder::GetInsets() const {
   return gfx::Insets(thickness_);
@@ skipping 144 matching lines @@
                                            const gfx::Insets& insets) {
   return base::MakeUnique<ExtraInsetsBorder>(std::move(border), insets);
 }
 
 std::unique_ptr<Border> CreateBorderPainter(std::unique_ptr<Painter> painter,
                                             const gfx::Insets& insets) {
   return base::WrapUnique(new BorderPainter(std::move(painter), insets));
 }
 
 }  // namespace views