Canvas refactoring part 2....

chrome/browser/views/tabs/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/tab.h"
 
 #include <limits>
 
 #include "app/multi_animation.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
 #include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/font.h"
 #include "gfx/path.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/image_button.h"
 #include "views/widget/root_view.h"
@@ skipping 358 matching lines @@
                              SkCanvas::kARGB_ClipLayer_SaveFlag);
       canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       PaintActiveTabBackground(canvas);
       canvas->restore();
     }
   }
 }
 
 void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
   // Render the inactive tab background. We'll use this for clipping.
-  gfx::Canvas background_canvas(width(), height(), false);
-  PaintInactiveTabBackground(&background_canvas);
+  gfx::CanvasSkia background_canvas(width(), height(), false);
+  PaintInactiveTabBackground(background_canvas.AsCanvas());
 
   SkBitmap background_image = background_canvas.ExtractBitmap();
 
   // Draw a radial gradient to hover_canvas.
-  gfx::Canvas hover_canvas(width(), height(), false);
+  gfx::CanvasSkia hover_canvas(width(), height(), false);
   int radius = kMiniTitleChangeGradientRadius;
   int x0 = width() + radius - kMiniTitleChangeInitialXOffset;
   int x1 = radius;
   int x2 = -radius;
   int x;
   if (mini_title_animation_->current_part_index() == 0) {
     x = mini_title_animation_->CurrentValueBetween(x0, x1);
   } else if (mini_title_animation_->current_part_index() == 1) {
     x = x1;
   } else {
@@ skipping 223 matching lines @@
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 
   tab_inactive_nano.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_LEFT);
   tab_inactive_nano.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_CENTER);
   tab_inactive_nano.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_NANO_RIGHT);
   tab_inactive_nano.l_width = tab_inactive_nano.image_l->width();
   tab_inactive_nano.r_width = tab_inactive_nano.image_r->width();
   tab_inactive_nano.y_offset = kNanoTabDiffHeight;
 }