Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/tabs/base_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/base_tab.h"
 
 #include <limits>
 
 #include "app/animation_container.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tabs/tab_controller.h"
 #include "chrome/common/chrome_switches.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
 
 #ifdef WIN32
 #include "app/win_util.h"
@@ skipping 399 matching lines @@
     SkBitmap* frames =
         (data().network_state == TabRendererData::NETWORK_STATE_WAITING) ?
         waiting_animation_frames : loading_animation_frames;
     int image_size = frames->height();
     int image_offset = loading_animation_frame_ * image_size;
     int dst_y = (height() - image_size) / 2;
     canvas->DrawBitmapInt(*frames, image_offset, 0, image_size,
                           image_size, favicon_x, dst_y, image_size, image_size,
                           false);
   } else {
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->ClipRectInt(0, 0, width(), height());
     if (should_display_crashed_favicon_) {
       canvas->DrawBitmapInt(*crashed_fav_icon, 0, 0,
                             crashed_fav_icon->width(),
                             crashed_fav_icon->height(),
                             favicon_x,
                             (height() - crashed_fav_icon->height()) / 2 +
                                 fav_icon_hiding_offset_,
                             kFavIconSize, kFavIconSize,
                             true);
     } else {
       if (!data().favicon.isNull()) {
         // TODO(pkasting): Use code in tab_icon_view.cc:PaintIcon() (or switch
         // to using that class to render the favicon).
         int size = data().favicon.width();
         canvas->DrawBitmapInt(data().favicon, 0, 0,
                               data().favicon.width(),
                               data().favicon.height(),
                               x, y + fav_icon_hiding_offset_, size, size,
                               true);
       }
     }
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   }
 }
 
 void BaseTab::PaintTitle(gfx::Canvas* canvas, SkColor title_color) {
   // Paint the Title.
   string16 title = data().title;
   if (title.empty()) {
     title = data().loading ?
         l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE) :
         TabContents::GetDefaultTitle();
@@ skipping 135 matching lines @@
   font_height_ = font_->height();
 }
 
 // static
 void BaseTab::LoadThemeImages() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
   waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
   loading_animation_size_ = loading_animation_frames->height();
 }