Rename paint data structures

ui/views/controls/scrollbar/cocoa_scroll_bar.mm

 // Copyright 2016 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.
 
 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
 
 #import "base/mac/sdk_forward_declarations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/compositor/layer.h"
@@ skipping 104 matching lines @@
 
 void CocoaScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
   SkColor thumb_color = kScrollerDefaultThumbColor;
   if (cocoa_scroll_bar()->GetScrollerStyle() == NSScrollerStyleOverlay ||
       IsStateHovered() ||
       IsStatePressed()) {
     thumb_color = kScrollerHoverThumbColor;
   }
 
   gfx::Rect local_bounds(GetLocalBounds());
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setColor(thumb_color);
   const SkScalar radius =
       std::min(local_bounds.width(), local_bounds.height());
   canvas->DrawRoundRect(local_bounds, radius, paint);
 }
 
 bool CocoaScrollBarThumb::OnMousePressed(const ui::MouseEvent& event) {
   // Ignore the mouse press if the scrollbar is hidden.
   if (cocoa_scroll_bar()->IsScrollbarFullyHidden())
     return false;
@@ skipping 111 matching lines @@
   gfx::Rect track_rect = GetLocalBounds();
 
   SkPoint gradient_bounds[2];
   if (IsHorizontal()) {
     gradient_bounds[0].set(track_rect.x(), track_rect.y());
     gradient_bounds[1].set(track_rect.x(), track_rect.bottom());
   } else {
     gradient_bounds[0].set(track_rect.x(), track_rect.y());
     gradient_bounds[1].set(track_rect.right(), track_rect.y());
   }
-  SkPaint gradient;
-  gradient.setShader(SkGradientShader::MakeLinear(
+  cc::PaintFlags gradient;
+  gradient.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
       gradient_bounds, kScrollerTrackGradientColors, nullptr,
-      arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode));
+      arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode)));
   canvas->DrawRect(track_rect, gradient);
 
   // Draw the inner border: top if horizontal, left if vertical.
-  SkPaint paint;
+  cc::PaintFlags paint;
   paint.setColor(kScrollerTrackInnerBorderColor);
   gfx::Rect inner_border(track_rect);
   if (IsHorizontal())
     inner_border.set_height(kScrollerTrackBorderWidth);
   else
     inner_border.set_width(kScrollerTrackBorderWidth);
   canvas->DrawRect(inner_border, paint);
 
   // Draw the outer border: bottom if horizontal, right if veritcal.
   paint.setColor(kScrollerTrackOuterBorderColor);
@@ skipping 259 matching lines @@
 CocoaScrollBarThumb* CocoaScrollBar::GetCocoaScrollBarThumb() const {
   return static_cast<CocoaScrollBarThumb*>(GetThumb());
 }
 
 // static
 base::Timer* BaseScrollBar::GetHideTimerForTest(BaseScrollBar* scroll_bar) {
   return &static_cast<CocoaScrollBar*>(scroll_bar)->hide_scrollbar_timer_;
 }
 
 }  // namespace views