Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/tab.cc

Index: chrome/browser/views/tabs/tab.cc
===================================================================
--- chrome/browser/views/tabs/tab.cc	(revision 50789)
+++ chrome/browser/views/tabs/tab.cc	(working copy)
@@ -13,6 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
+#include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
@@ -381,20 +382,18 @@
     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 Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
   // Render the inactive tab background. We'll use this for clipping.
-  gfx::CanvasSkia background_canvas(width(), height(), false);
+  gfx::Canvas background_canvas(width(), height(), false);
   PaintInactiveTabBackground(&background_canvas);
 
   SkBitmap background_image = background_canvas.ExtractBitmap();
@@ -438,10 +437,10 @@
 
   // And then the gradient on top of that.
   if (mini_title_animation_->current_part_index() == 2) {
-    canvas->AsCanvasSkia()->saveLayerAlpha(
-        NULL, mini_title_animation_->CurrentValueBetween(255, 0));
+    canvas->saveLayerAlpha(NULL,
+                           mini_title_animation_->CurrentValueBetween(255, 0));
     canvas->DrawBitmapInt(hover_image, 0, 0);
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   } else {
     canvas->DrawBitmapInt(hover_image, 0, 0);
   }