Rename paint data structures

ui/views/controls/button/label_button_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/controls/button/label_button_border.h"
 
 #include "base/logging.h"
-#include "third_party/skia/include/core/SkPaint.h"
+#include "cc/paint/paint_flags.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 116 matching lines @@
   ui::NativeTheme::ExtraParams extra;
   const gfx::Animation* animation = native_theme_delegate->GetThemeAnimation();
   ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);
 
   if (animation && animation->is_animating()) {
     // Linearly interpolate background and foreground painters during animation.
     uint8_t fg_alpha =
         static_cast<uint8_t>(animation->CurrentValueBetween(0, 255));
 
     const SkRect sk_rect = gfx::RectToSkRect(rect);
-    SkAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
+    cc::PaintCanvasAutoRestore auto_restore(canvas->sk_canvas(), false);
     canvas->sk_canvas()->saveLayer(&sk_rect, nullptr);
 
     {
       // First, modulate the background by 1 - alpha.
-      SkAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
+      cc::PaintCanvasAutoRestore auto_restore(canvas->sk_canvas(), false);
       canvas->sk_canvas()->saveLayerAlpha(&sk_rect, 255 - fg_alpha);
       state = native_theme_delegate->GetBackgroundThemeState(&extra);
       PaintHelper(this, canvas, state, rect, extra);
     }
 
     // Then modulate the foreground by alpha, and blend using kPlus_Mode.
-    SkPaint paint;
+    cc::PaintFlags paint;
     paint.setAlpha(fg_alpha);
     paint.setBlendMode(SkBlendMode::kPlus);
     canvas->sk_canvas()->saveLayer(&sk_rect, &paint);
     state = native_theme_delegate->GetForegroundThemeState(&extra);
     PaintHelper(this, canvas, state, rect, extra);
   } else {
     PaintHelper(this, canvas, state, rect, extra);
   }
 }
 
@@ skipping 13 matching lines @@
   return painters_[focused ? 1 : 0][state].get();
 }
 
 void LabelButtonAssetBorder::SetPainter(bool focused,
                                         Button::ButtonState state,
                                         std::unique_ptr<Painter> painter) {
   painters_[focused ? 1 : 0][state] = std::move(painter);
 }
 
 }  // namespace views