Fix cc/paint skia type mismatches

chrome/browser/ui/libgtkui/native_theme_gtk3.cc

 // 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.
 
 #include "chrome/browser/ui/libgtkui/native_theme_gtk3.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 410 matching lines @@
 
 SkColor NativeThemeGtk3::GetSystemColor(ColorId color_id) const {
   if (color_cache_[color_id])
     return color_cache_[color_id].value();
 
   SkColor color = SkColorFromColorId(color_id);
   color_cache_[color_id] = color;
   return color;
 }
 
-void NativeThemeGtk3::PaintArrowButton(SkCanvas* canvas,
+void NativeThemeGtk3::PaintArrowButton(cc::PaintCanvas* canvas,
                                        const gfx::Rect& rect,
                                        Part direction,
                                        State state) const {
   auto context = GetStyleContextFromCss(
       GtkVersionCheck(3, 20)
           ? "GtkScrollbar#scrollbar #contents GtkButton#button"
           : "GtkRange.scrollbar.button");
   GtkStateFlags state_flags = StateToStateFlags(state);
   gtk_style_context_set_state(context, state_flags);
 
@@ skipping 12 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 
   PaintWidget(canvas, rect, context, BG_RENDER_NORMAL, true);
   PaintArrow(canvas, rect, direction, GetFgColorFromStyleContext(context));
 }
 
 void NativeThemeGtk3::PaintScrollbarTrack(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     Part part,
     State state,
     const ScrollbarTrackExtraParams& extra_params,
     const gfx::Rect& rect) const {
   PaintWidget(canvas, rect, GetStyleContextFromCss(
                                 GtkVersionCheck(3, 20)
                                     ? "GtkScrollbar#scrollbar #contents #trough"
                                     : "GtkScrollbar.scrollbar.trough"),
               BG_RENDER_NORMAL, true);
 }
 
 void NativeThemeGtk3::PaintScrollbarThumb(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     Part part,
     State state,
     const gfx::Rect& rect,
     NativeTheme::ScrollbarOverlayColorTheme theme) const {
   auto context = GetStyleContextFromCss(
       GtkVersionCheck(3, 20)
           ? "GtkScrollbar#scrollbar #contents #trough #slider"
           : "GtkScrollbar.scrollbar.slider");
   gtk_style_context_set_state(context, StateToStateFlags(state));
   PaintWidget(canvas, rect, context, BG_RENDER_NORMAL, true);
 }
 
-void NativeThemeGtk3::PaintScrollbarCorner(SkCanvas* canvas,
+void NativeThemeGtk3::PaintScrollbarCorner(cc::PaintCanvas* canvas,
                                            State state,
                                            const gfx::Rect& rect) const {
   auto context = GetStyleContextFromCss(
       GtkVersionCheck(3, 19, 2)
           ? "GtkScrolledWindow#scrolledwindow #junction"
           : "GtkScrolledWindow.scrolledwindow.scrollbars-junction");
   PaintWidget(canvas, rect, context, BG_RENDER_NORMAL, true);
 }
 
 void NativeThemeGtk3::PaintMenuPopupBackground(
     cc::PaintCanvas* canvas,
     const gfx::Size& size,
     const MenuBackgroundExtraParams& menu_background) const {
   PaintWidget(canvas, gfx::Rect(size), GetStyleContextFromCss("GtkMenu#menu"),
               BG_RENDER_RECURSIVE, false);
 }
 
 void NativeThemeGtk3::PaintMenuItemBackground(
     cc::PaintCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuItemExtraParams& menu_item) const {
   auto context = GetStyleContextFromCss("GtkMenu#menu GtkMenuItem#menuitem");
   gtk_style_context_set_state(context, StateToStateFlags(state));
   PaintWidget(canvas, rect, context, BG_RENDER_NORMAL, true);
 }
 
 void NativeThemeGtk3::PaintMenuSeparator(
-    SkCanvas* canvas,
+    cc::PaintCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const MenuSeparatorExtraParams& menu_separator) const {
   auto separator_offset = [&](int separator_thickness) {
     switch (menu_separator.type) {
       case ui::LOWER_SEPARATOR:
         return rect.height() - separator_thickness;
       case ui::UPPER_SEPARATOR:
         return 0;
       default:
@@ skipping 29 matching lines @@
     GtkBorder padding;
     gtk_style_context_get_padding(context, gtk_style_context_get_state(context),
                                   &padding);
     int w = rect.width() - padding.left - padding.right;
     int x = rect.x() + padding.left;
     int h = wide_separators ? separator_height : 1;
     int y = rect.y() + separator_offset(h);
     if (wide_separators) {
       PaintWidget(canvas, gfx::Rect(x, y, w, h), context, BG_RENDER_NONE, true);
     } else {
-      SkPaint paint;
-      paint.setColor(GetFgColorFromStyleContext(context));
-      canvas->drawLine(x, y, x + w, y, paint);
+      cc::PaintFlags flags;
+      flags.setColor(GetFgColorFromStyleContext(context));
+      canvas->drawLine(x, y, x + w, y, flags);
     }
   }
 }
 
 void NativeThemeGtk3::PaintFrameTopArea(
     cc::PaintCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const FrameTopAreaExtraParams& frame_top_area) const {
   auto context = GetStyleContextFromCss(frame_top_area.use_custom_frame
                                             ? "#headerbar.header-bar.titlebar"
                                             : "GtkMenuBar#menubar");
   ApplyCssToContext(context, "* { border-radius: 0px; border-style: none; }");
   gtk_style_context_set_state(context, frame_top_area.is_active
                                            ? GTK_STATE_FLAG_NORMAL
                                            : GTK_STATE_FLAG_BACKDROP);
 
   SkBitmap bitmap =
       GetWidgetBitmap(rect.size(), context, BG_RENDER_RECURSIVE, false);
 
   if (frame_top_area.incognito) {
     bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
         bitmap, kDefaultTintFrameIncognito);
   }
 
   canvas->drawBitmap(bitmap, rect.x(), rect.y());
 }
 
 }  // namespace libgtkui