Revert 50784 - Canvas refactoring part 3....

chrome/browser/gtk/tabs/tab_renderer_gtk.cc

 // Copyright (c) 2010 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/gtk/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "app/l10n_util.h"
@@ skipping 601 matching lines @@
   }
 
   if (!mini() || width() > kMiniTabRendererAsNormalTabWidth)
     PaintTitle(canvas);
 
   if (show_icon)
     PaintIcon(canvas);
 }
 
 SkBitmap TabRendererGtk::PaintBitmap() {
-  gfx::CanvasSkia canvas(width(), height(), false);
+  gfx::Canvas canvas(width(), height(), false);
   Paint(&canvas);
   return canvas.ExtractBitmap();
 }
 
 cairo_surface_t* TabRendererGtk::PaintToSurface() {
-  gfx::CanvasSkia canvas(width(), height(), false);
+  gfx::Canvas canvas(width(), height(), false);
   Paint(&canvas);
   return cairo_surface_reference(cairo_get_target(canvas.beginPlatformPaint()));
 }
 
 void TabRendererGtk::SchedulePaint() {
   gtk_widget_queue_draw(tab_.get());
 }
 
 gfx::Rect TabRendererGtk::GetLocalBounds() {
   return gfx::Rect(0, 0, bounds_.width(), bounds_.height());
@@ skipping 158 matching lines @@
                                      : unselected_title_color_;
   canvas->DrawStringInt(UTF16ToWideHack(title), *title_font_, title_color,
                         title_bounds_.x(), title_bounds_.y(),
                         title_bounds_.width(), title_bounds_.height());
 }
 
 void TabRendererGtk::PaintIcon(gfx::Canvas* canvas) {
   if (loading_animation_.animation_state() != ANIMATION_NONE) {
     PaintLoadingAnimation(canvas);
   } else {
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->ClipRectInt(0, 0, width(), height() - kFavIconTitleSpacing);
     if (should_display_crashed_favicon_) {
       canvas->DrawBitmapInt(*crashed_fav_icon, 0, 0,
                             crashed_fav_icon->width(),
                             crashed_fav_icon->height(),
                             favicon_bounds_.x(),
                             favicon_bounds_.y() + fav_icon_hiding_offset_,
                             kFavIconSize, kFavIconSize,
                             true);
     } else {
       if (!data_.favicon.isNull()) {
         if (data_.is_default_favicon && theme_provider_->UseGtkTheme()) {
           GdkPixbuf* favicon = GtkThemeProvider::GetDefaultFavicon(true);
-          canvas->AsCanvasSkia()->DrawGdkPixbuf(
-              favicon, favicon_bounds_.x(),
-              favicon_bounds_.y() + fav_icon_hiding_offset_);
+          canvas->DrawGdkPixbuf(favicon, favicon_bounds_.x(),
+                                favicon_bounds_.y() + fav_icon_hiding_offset_);
         } else {
           // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
           // to using that class to render the favicon).
           canvas->DrawBitmapInt(data_.favicon, 0, 0,
                                 data_.favicon.width(),
                                 data_.favicon.height(),
                                 favicon_bounds_.x(),
                                 favicon_bounds_.y() + fav_icon_hiding_offset_,
                                 kFavIconSize, kFavIconSize,
                                 true);
         }
       }
     }
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   }
 }
 
 void TabRendererGtk::PaintTabBackground(gfx::Canvas* canvas) {
   if (IsSelected()) {
     PaintActiveTabBackground(canvas);
   } else {
     PaintInactiveTabBackground(canvas);
 
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
       SkRect bounds;
       bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-      canvas->AsCanvasSkia()->saveLayerAlpha(
-          &bounds, static_cast<int>(throb_value * 0xff),
-          SkCanvas::kARGB_ClipLayer_SaveFlag);
-      canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255,
-                                       SkXfermode::kClear_Mode);
+      canvas->saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff),
+                             SkCanvas::kARGB_ClipLayer_SaveFlag);
+      canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       PaintActiveTabBackground(canvas);
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
     }
   }
 }
 
 void TabRendererGtk::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   bool is_otr = data_.off_the_record;
 
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.
   int offset_x = background_offset_x_;
@@ skipping 194 matching lines @@
   // Force the font size to 9pt, which matches Windows' default font size
   // (taken from the system).
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 9));
   title_font_height_ = title_font_->height();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }