| Index: chrome/browser/ui/libgtkui/native_theme_gtk3.cc
|
| diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
|
| index 113951a284036bdf42f25bb867b3dd81952c2fa2..0754df687c7960e8501413d9c3fef0ecdca707ba 100644
|
| --- a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
|
| +++ b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
|
| @@ -428,7 +428,7 @@ SkColor NativeThemeGtk3::GetSystemColor(ColorId color_id) const {
|
| return color;
|
| }
|
|
|
| -void NativeThemeGtk3::PaintArrowButton(SkCanvas* canvas,
|
| +void NativeThemeGtk3::PaintArrowButton(cc::PaintCanvas* canvas,
|
| const gfx::Rect& rect,
|
| Part direction,
|
| State state) const {
|
| @@ -461,7 +461,7 @@ void NativeThemeGtk3::PaintArrowButton(SkCanvas* canvas,
|
| }
|
|
|
| void NativeThemeGtk3::PaintScrollbarTrack(
|
| - SkCanvas* canvas,
|
| + cc::PaintCanvas* canvas,
|
| Part part,
|
| State state,
|
| const ScrollbarTrackExtraParams& extra_params,
|
| @@ -474,7 +474,7 @@ void NativeThemeGtk3::PaintScrollbarTrack(
|
| }
|
|
|
| void NativeThemeGtk3::PaintScrollbarThumb(
|
| - SkCanvas* canvas,
|
| + cc::PaintCanvas* canvas,
|
| Part part,
|
| State state,
|
| const gfx::Rect& rect,
|
| @@ -487,7 +487,7 @@ void NativeThemeGtk3::PaintScrollbarThumb(
|
| 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(
|
| @@ -516,7 +516,7 @@ void NativeThemeGtk3::PaintMenuItemBackground(
|
| }
|
|
|
| void NativeThemeGtk3::PaintMenuSeparator(
|
| - SkCanvas* canvas,
|
| + cc::PaintCanvas* canvas,
|
| State state,
|
| const gfx::Rect& rect,
|
| const MenuSeparatorExtraParams& menu_separator) const {
|
| @@ -566,9 +566,9 @@ void NativeThemeGtk3::PaintMenuSeparator(
|
| 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);
|
| }
|
| }
|
| }
|
|
|