Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/frame/glass_browser_frame_view.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/frame/glass_browser_frame_view.h"
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/icon_util.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "views/window/client_view.h"
 #include "views/window/window_resources.h"
 
 HICON GlassBrowserFrameView::throbber_icons_[
     GlassBrowserFrameView::kThrobberIconCount];
 
 namespace {
@@ skipping 231 matching lines @@
     int y = tabstrip_bounds.y();
     int w = toolbar_bounds.right() - x;
 
     int src_y = Tab::GetMinimumUnselectedSize().height();
     canvas->TileImageInt(*theme_toolbar, 0, src_y,
                          MirroredLeftPointForRect(toolbar_bounds), y,
                          toolbar_bounds.width(), theme_toolbar->height());
 
     // Draw left edge. We explicitly set a clip as the image is bigger than just
     // the corner.
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->ClipRectInt(x - kNonClientBorderThickness,
                         y - kNonClientBorderThickness,
                         kNonClientBorderThickness,
                         kNonClientBorderThickness);
     canvas->DrawBitmapInt(*toolbar_left, x - kNonClientBorderThickness,
                           y - kNonClientBorderThickness);
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
 
     // Draw center edge. We need to draw a while line above the toolbar for the
     // image to overlay nicely.
     canvas->FillRectInt(SK_ColorWHITE, x, y - 1, w, 1);
     canvas->TileImageInt(*toolbar_center, x, y - kNonClientBorderThickness, w,
                          toolbar_center->height());
     // Right edge. Again, we have to clip because of image size.
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->ClipRectInt(x + w - kNonClientBorderThickness,
                         y - kNonClientBorderThickness,
                         kNonClientBorderThickness,
                         kNonClientBorderThickness);
     canvas->DrawBitmapInt(*tp->GetBitmapNamed(IDR_CONTENT_TOP_RIGHT_CORNER),
                           x + w, y);
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   } else {
     // Draw the toolbar background, setting src_y of the paint to the tab
     // strip height as the toolbar background begins at the top of the tabs.
     int src_y = browser_view_->GetTabStripHeight() - 1;
     canvas->TileImageInt(*theme_toolbar, 0, src_y,
                          toolbar_bounds.x() - 1, toolbar_bounds.y() + 2,
                          toolbar_bounds.width() + 2, theme_toolbar->height());
     // Draw rounded corners for the tab.
     SkBitmap* toolbar_left_mask =
         tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER_MASK);
@@ skipping 49 matching lines @@
   int dst_x = MirroredLeftPointForRect(otr_avatar_bounds_);
   int dst_y = otr_avatar_bounds_.y();
   int w = otr_avatar_bounds_.width();
   int h = otr_avatar_bounds_.height();
   if (browser_view_->UseVerticalTabs()) {
     // Only a portion of the otr icon is visible for vertical tabs. Clip it
     // so that it doesn't overlap shadows.
     gfx::Point tabstrip_origin(browser_view_->tabstrip()->bounds().origin());
     View::ConvertPointToView(frame_->GetWindow()->GetClientView(), this,
                              &tabstrip_origin);
-    canvas->AsCanvasSkia()->save();
+    canvas->save();
     canvas->ClipRectInt(dst_x, 2, w, tabstrip_origin.y() - 4);
     canvas->DrawBitmapInt(otr_avatar_icon, src_x, src_y, w, h, dst_x, dst_y,
                           w, h, false);
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   } else {
     canvas->DrawBitmapInt(otr_avatar_icon, src_x, src_y, w, h, dst_x, dst_y,
                           w, h, false);
   }
 }
 
 void GlassBrowserFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   ThemeProvider* tp = GetThemeProvider();
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
@@ skipping 143 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }