Canvas refactoring part 3....

chrome/browser/views/frame/opaque_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/opaque_browser_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/toolbar_view.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
@@ skipping 346 matching lines @@
   }
 
   // The otr icon is clipped for side tabs.
   for (int i = 0, count = GetChildViewCount(); i < count; ++i) {
     View* child = GetChildViewAt(i);
     if (!child) {
       NOTREACHED() << "Should not have a NULL child View for index in bounds";
       continue;
     }
     if (child == otr_avatar_icon_) {
-      canvas->save();
+      canvas->AsCanvasSkia()->save();
       canvas->ClipRectInt(0, 2, width(), otr_avatar_icon_->height() - 10);
       child->ProcessPaint(canvas);
-      canvas->restore();
+      canvas->AsCanvasSkia()->restore();
     } else {
       child->ProcessPaint(canvas);
     }
   }
 }
 
 void OpaqueBrowserFrameView::Layout() {
   LayoutWindowControls();
   LayoutTitleBar();
   LayoutOTRAvatar();
@@ skipping 379 matching lines @@
   int bottom_y = y + split_point;
   SkBitmap* toolbar_left = tp->GetBitmapNamed(IDR_CONTENT_TOP_LEFT_CORNER);
   int bottom_edge_height = std::min(toolbar_left->height(), h) - split_point;
 
   // Split our canvas out so we can mask out the corners of the toolbar
   // without masking out the frame.
   SkRect bounds;
   bounds.set(SkIntToScalar(x - kClientEdgeThickness), SkIntToScalar(y),
              SkIntToScalar(x + w + kClientEdgeThickness * 2),
              SkIntToScalar(y + h));
-  canvas->saveLayerAlpha(&bounds, 255);
-  canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
+  canvas->AsCanvasSkia()->saveLayerAlpha(&bounds, 255);
+  canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
 
   SkColor theme_toolbar_color =
       tp->GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
   canvas->FillRectInt(theme_toolbar_color, x, bottom_y, w, bottom_edge_height);
 
   int strip_height = browser_view_->GetTabStripHeight();
   SkBitmap* theme_toolbar = tp->GetBitmapNamed(IDR_THEME_TOOLBAR);
 
   canvas->TileImageInt(*theme_toolbar,
       x - kClientEdgeThickness,
@@ skipping 29 matching lines @@
   // Mask the right edge.
   int right_x = x + w - toolbar_right_mask->width() + kClientEdgeThickness +
                 kContentEdgeShadowThickness;
   canvas->DrawBitmapInt(*toolbar_right_mask, 0, 0,
       toolbar_right_mask->width(), split_point, right_x, y,
       toolbar_right_mask->width(), split_point, false, paint);
   canvas->DrawBitmapInt(*toolbar_right_mask, 0,
       toolbar_right_mask->height() - bottom_edge_height,
       toolbar_right_mask->width(), bottom_edge_height, right_x, bottom_y,
       toolbar_right_mask->width(), bottom_edge_height, false, paint);
-  canvas->restore();
+  canvas->AsCanvasSkia()->restore();
 
   canvas->DrawBitmapInt(*toolbar_left, 0, 0, toolbar_left->width(), split_point,
       left_x, y,
       toolbar_left->width(), split_point, false);
   canvas->DrawBitmapInt(*toolbar_left, 0,
       toolbar_left->height() - bottom_edge_height, toolbar_left->width(),
       bottom_edge_height, left_x, bottom_y,
       toolbar_left->width(), bottom_edge_height, false);
 
   SkBitmap* toolbar_center =
@@ skipping 230 matching lines @@
 // static
 gfx::Rect OpaqueBrowserFrameView::GetViewBounds(views::View* src,
                                                 views::View* dst) {
   gfx::Rect bounds(src->bounds());
 
   gfx::Point origin_in_dst(bounds.origin());
   View::ConvertPointToView(src->GetParent(), dst, &origin_in_dst);
   bounds.set_origin(origin_in_dst);
   return bounds;
 }