Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/tab_strip.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/tab_strip.h"
 
 #include "app/animation_container.h"
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/compiler_specific.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip_controller.h"
 #include "chrome/common/pref_names.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/path.h"
 #include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
@@ skipping 255 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, views::View overrides:
 
 void TabStrip::PaintChildren(gfx::Canvas* canvas) {
   // Tabs are painted in reverse order, so they stack to the left.
   // Phantom tabs appear behind all other tabs and are rendered first. To make
   // them slightly transparent we render them to a different layer.
   if (HasPhantomTabs()) {
     SkRect bounds;
     bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-    canvas->AsCanvasSkia()->saveLayerAlpha(
-        &bounds, kPhantomTabAlpha, SkCanvas::kARGB_ClipLayer_SaveFlag);
-    canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+    canvas->saveLayerAlpha(&bounds, kPhantomTabAlpha,
+                           SkCanvas::kARGB_ClipLayer_SaveFlag);
+    canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
     for (int i = tab_count() - 1; i >= 0; --i) {
       Tab* tab = GetTabAtTabDataIndex(i);
       if (tab->data().phantom)
         tab->ProcessPaint(canvas);
     }
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
 
-    canvas->AsCanvasSkia()->saveLayerAlpha(
-        &bounds, kPhantomTabIconAlpha, SkCanvas::kARGB_ClipLayer_SaveFlag);
-    canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+    canvas->saveLayerAlpha(&bounds, kPhantomTabIconAlpha,
+                           SkCanvas::kARGB_ClipLayer_SaveFlag);
+    canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
     for (int i = tab_count() - 1; i >= 0; --i) {
       Tab* tab = GetTabAtTabDataIndex(i);
       if (tab->data().phantom) {
-        canvas->AsCanvasSkia()->save();
+        canvas->save();
         canvas->ClipRectInt(tab->MirroredX(), tab->y(), tab->width(),
                             tab->height());
         canvas->TranslateInt(tab->MirroredX(), tab->y());
         tab->PaintIcon(canvas);
-        canvas->AsCanvasSkia()->restore();
+        canvas->restore();
       }
     }
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   }
 
   Tab* selected_tab = NULL;
 
   Tab* dragging_tab = NULL;
 
   for (int i = tab_count() - 1; i >= 0; --i) {
     Tab* tab = GetTabAtTabDataIndex(i);
     // We must ask the _Tab's_ model, not ourselves, because in some situations
     // the model will be different to this object, e.g. when a Tab is being
@@ skipping 829 matching lines @@
   }
 }
 
 bool TabStrip::HasPhantomTabs() const {
   for (int i = 0; i < tab_count(); ++i) {
     if (GetTabAtTabDataIndex(i)->data().phantom)
       return true;
   }
   return false;
 }