Index: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc |
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc |
index ef9b27edcf5485902b5303043b034dcb25fe6e90..1d416dc6bb22fdc9ec23de6753cd75b87a9530f4 100644 |
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc |
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc |
@@ -419,15 +419,16 @@ void TabRendererGtk::PaintFaviconArea(GdkEventExpose* event) { |
SkRect bounds; |
bounds.set(favicon_bounds_.x(), favicon_bounds_.y(), |
favicon_bounds_.right(), favicon_bounds_.bottom()); |
- canvas.saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff), |
- SkCanvas::kARGB_ClipLayer_SaveFlag); |
- canvas.drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); |
+ canvas.sk_canvas()->saveLayerAlpha( |
+ &bounds, static_cast<int>(throb_value * 0xff), |
+ SkCanvas::kARGB_ClipLayer_SaveFlag); |
+ canvas.sk_canvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode); |
SkBitmap* active_bg = theme_service_->GetBitmapNamed(IDR_THEME_TOOLBAR); |
canvas.TileImageInt(*active_bg, |
x() + favicon_bounds_.x(), favicon_bounds_.y(), |
favicon_bounds_.x(), favicon_bounds_.y(), |
favicon_bounds_.width(), favicon_bounds_.height()); |
- canvas.restore(); |
+ canvas.sk_canvas()->restore(); |
} |
} |
@@ -655,7 +656,7 @@ cairo_surface_t* TabRendererGtk::PaintToSurface() { |
gfx::CanvasSkia canvas(width(), height(), false); |
Paint(&canvas); |
return cairo_surface_reference(cairo_get_target( |
- skia::BeginPlatformPaint(&canvas))); |
+ skia::BeginPlatformPaint(canvas.sk_canvas()))); |
} |
void TabRendererGtk::SchedulePaint() { |
@@ -887,8 +888,8 @@ void TabRendererGtk::PaintTabBackground(gfx::Canvas* canvas) { |
if (throb_value > 0) { |
canvas->SaveLayerAlpha(static_cast<int>(throb_value * 0xff), |
gfx::Rect(width(), height())); |
- canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, |
- SkXfermode::kClear_Mode); |
+ canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, |
+ SkXfermode::kClear_Mode); |
PaintActiveTabBackground(canvas); |
canvas->Restore(); |
} |