Rename paint data structures

chrome/browser/ui/libgtkui/native_theme_gtk2.cc

 // Copyright (c) 2013 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/ui/libgtkui/native_theme_gtk2.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
@@ skipping 53 matching lines @@
   CR_DEFINE_STATIC_LOCAL(NativeThemeGtk2, s_native_theme, ());
   return &s_native_theme;
 }
 
 // Constructors automatically called
 NativeThemeGtk2::NativeThemeGtk2() {}
 // This doesn't actually get called
 NativeThemeGtk2::~NativeThemeGtk2() {}
 
 void NativeThemeGtk2::PaintMenuPopupBackground(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     const gfx::Size& size,
     const MenuBackgroundExtraParams& menu_background) const {
   if (menu_background.corner_radius > 0) {
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setFlags(SkPaint::kAntiAlias_Flag);
+    cc::PaintFlags paint;
+    paint.setStyle(cc::PaintFlags::kFill_Style);
+    paint.setFlags(cc::PaintFlags::kAntiAlias_Flag);
     paint.setColor(GetSystemColor(kColorId_MenuBackgroundColor));
 
     gfx::Path path;
     SkRect rect = SkRect::MakeWH(SkIntToScalar(size.width()),
                                  SkIntToScalar(size.height()));
     SkScalar radius = SkIntToScalar(menu_background.corner_radius);
     SkScalar radii[8] = {radius, radius, radius, radius,
                          radius, radius, radius, radius};
     path.addRoundRect(rect, radii);
 
     canvas->drawPath(path, paint);
   } else {
     canvas->drawColor(GetSystemColor(kColorId_MenuBackgroundColor),
                       SkBlendMode::kSrc);
   }
 }
 
 void NativeThemeGtk2::PaintMenuItemBackground(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& menu_item) const {
   SkColor color;
-  SkPaint paint;
+  cc::PaintFlags paint;
   switch (state) {
     case NativeTheme::kNormal:
     case NativeTheme::kDisabled:
       color = GetSystemColor(NativeTheme::kColorId_MenuBackgroundColor);
       paint.setColor(color);
       break;
     case NativeTheme::kHovered:
       color =
           GetSystemColor(NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
       paint.setColor(color);
@@ skipping 347 matching lines @@
 GtkWidget* NativeThemeGtk2::GetSeparator() const {
   static GtkWidget* fake_separator = NULL;
 
   if (!fake_separator)
     fake_separator = gtk_hseparator_new();
 
   return fake_separator;
 }
 
 }  // namespace libgtkui