Rename paint data structures

ui/views/painter.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/painter.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "cc/paint/paint_shader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_f.h"
@@ skipping 40 matching lines @@
   return gfx::Size();
 }
 
 void SolidRoundRectPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
 
   gfx::RectF border_rect_f(gfx::ScaleToEnclosingRect(gfx::Rect(size), scale));
   const SkScalar scaled_corner_radius = SkFloatToScalar(radius_ * scale);
 
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setColor(bg_color_);
   canvas->DrawRoundRect(border_rect_f, scaled_corner_radius, paint);
 
   border_rect_f.Inset(gfx::InsetsF(0.5f));
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   paint.setStrokeWidth(1);
   paint.setColor(stroke_color_);
   canvas->DrawRoundRect(border_rect_f, scaled_corner_radius, paint);
 }
 
 // DashedFocusPainter ----------------------------------------------------------
 
 class DashedFocusPainter : public Painter {
  public:
   explicit DashedFocusPainter(const gfx::Insets& insets);
@@ skipping 107 matching lines @@
 }
 
 GradientPainter::~GradientPainter() {
 }
 
 gfx::Size GradientPainter::GetMinimumSize() const {
   return gfx::Size();
 }
 
 void GradientPainter::Paint(gfx::Canvas* canvas, const gfx::Size& size) {
-  SkPaint paint;
+  cc::PaintFlags paint;
   SkPoint p[2];
   p[0].iset(0, 0);
   if (horizontal_)
     p[1].iset(size.width(), 0);
   else
     p[1].iset(0, size.height());
 
-  paint.setShader(SkGradientShader::MakeLinear(
-      p, colors_.get(), pos_.get(), count_, SkShader::kClamp_TileMode));
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
+      p, colors_.get(), pos_.get(), count_, SkShader::kClamp_TileMode)));
+  paint.setStyle(cc::PaintFlags::kFill_Style);
 
   canvas->sk_canvas()->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
                                       SkIntToScalar(size.width()),
                                       SkIntToScalar(size.height()), paint);
 }
 
 // ImagePainter ---------------------------------------------------------------
 
 // ImagePainter stores and paints nine images as a scalable grid.
 class ImagePainter : public Painter {
@@ skipping 166 matching lines @@
   canvas->DrawImageInt(*images_[LEFT], 0, 0);
   canvas->DrawImageInt(*images_[RIGHT], size.width() - images_[RIGHT]->width(),
                        0);
   canvas->TileImageInt(
       *images_[CENTER], images_[LEFT]->width(), 0,
       size.width() - images_[LEFT]->width() - images_[RIGHT]->width(),
       images_[LEFT]->height());
 }
 
 }  // namespace views