Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/side_tab.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/views/tabs/side_tab.h"
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "gfx/path.h"
 #include "gfx/skia_util.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/image_button.h"
 
 namespace {
 const int kVerticalTabHeight = 27;
 const int kTitleCloseSpacing = 4;
 const SkScalar kRoundRectRadius = 4;
@@ skipping 62 matching lines @@
       font_height());
 }
 
 void SideTab::Paint(gfx::Canvas* canvas) {
   if (ShouldPaintHighlight()) {
     SkPaint paint;
     paint.setColor(kTabBackgroundColor);
     paint.setAntiAlias(true);
     SkRect border_rect = { SkIntToScalar(0), SkIntToScalar(0),
                            SkIntToScalar(width()), SkIntToScalar(height()) };
-    canvas->AsCanvasSkia()->drawRoundRect(border_rect,
-                                          SkIntToScalar(kRoundRectRadius),
-                                          SkIntToScalar(kRoundRectRadius),
-                                          paint);
+    canvas->drawRoundRect(border_rect, SkIntToScalar(kRoundRectRadius),
+                          SkIntToScalar(kRoundRectRadius), paint);
   }
 
   if (ShouldShowIcon()) {
     if (data().phantom) {
       SkRect bounds;
       bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-      canvas->AsCanvasSkia()->saveLayerAlpha(
-          &bounds, kPhantomTabIconAlpha, SkCanvas::kARGB_ClipLayer_SaveFlag);
+      canvas->saveLayerAlpha(&bounds, kPhantomTabIconAlpha,
+                             SkCanvas::kARGB_ClipLayer_SaveFlag);
       PaintIcon(canvas, icon_bounds_.x(), icon_bounds_.y());
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
     } else {
       PaintIcon(canvas, icon_bounds_.x(), icon_bounds_.y());
     }
   }
 
   PaintTitle(canvas, data().phantom ? kPhantomTextColor : kTextColor);
 }
 
 gfx::Size SideTab::GetPreferredSize() {
   return gfx::Size(0, GetPreferredHeight());
 }
 
 bool SideTab::ShouldPaintHighlight() const {
   return IsSelected() || !controller();
 }
 
 bool SideTab::ShouldShowIcon() const {
   return data().mini || data().show_icon;
 }