Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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/ui/views/tabs/tab.h"
 
 #include <limits>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 547 matching lines @@
       canvas->Restore();
     }
   }
 }
 
 void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
   // Render the inactive tab background. We'll use this for clipping.
   gfx::Canvas background_canvas(size(), canvas->scale_factor(), false);
   PaintInactiveTabBackground(&background_canvas);
 
-  gfx::ImageSkia background_image(background_canvas.ExtractImageSkiaRep());
+  gfx::ImageSkia background_image(background_canvas.ExtractImageRep());
 
   // Draw a radial gradient to hover_canvas.
   gfx::Canvas hover_canvas(size(), canvas->scale_factor(), 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 {
     x = mini_title_animation_->CurrentValueBetween(x1, x2);
   }
   SkPoint center_point;
   center_point.iset(x, 0);
   SkColor colors[2] = { kMiniTitleChangeGradientColor1,
                         kMiniTitleChangeGradientColor2 };
   SkShader* shader = SkGradientShader::CreateRadial(center_point,
       SkIntToScalar(radius), colors, NULL, 2, SkShader::kClamp_TileMode);
   SkPaint paint;
   paint.setShader(shader);
   shader->unref();
   hover_canvas.DrawRect(gfx::Rect(x - radius, -radius, radius * 2, radius * 2),
                         paint);
 
   // Draw the radial gradient clipped to the background into hover_image.
   gfx::ImageSkia hover_image = gfx::ImageSkiaOperations::CreateMaskedImage(
-      gfx::ImageSkia(hover_canvas.ExtractImageSkiaRep()), background_image);
+      gfx::ImageSkia(hover_canvas.ExtractImageRep()), background_image);
 
   // Draw the tab background to the canvas.
   canvas->DrawImageInt(background_image, 0, 0);
 
   // And then the gradient on top of that.
   if (mini_title_animation_->current_part_index() == 2) {
     canvas->SaveLayerAlpha(mini_title_animation_->CurrentValueBetween(255, 0));
     canvas->DrawImageInt(hover_image, 0, 0);
     canvas->Restore();
   } else {
@@ skipping 61 matching lines @@
   // rectangle. And again, don't draw over the toolbar.
   background_canvas.TileImageInt(*tab_bg,
      offset + tab_image->l_width,
      bg_offset_y + drop_shadow_height() + tab_image->y_offset,
      tab_image->l_width,
      drop_shadow_height() + tab_image->y_offset,
      width() - tab_image->l_width - tab_image->r_width,
      height() - drop_shadow_height() - kToolbarOverlap - tab_image->y_offset);
 
   canvas->DrawImageInt(
-      gfx::ImageSkia(background_canvas.ExtractImageSkiaRep()), 0, 0);
+      gfx::ImageSkia(background_canvas.ExtractImageRep()), 0, 0);
 
   if (!GetThemeProvider()->HasCustomImage(tab_id) &&
       hover_controller().ShouldDraw()) {
-    hover_controller().Draw(canvas, background_canvas.ExtractImageSkiaRep());
+    hover_controller().Draw(canvas, background_canvas.ExtractImageRep());
   }
 
   // Now draw the highlights/shadows around the tab edge.
   canvas->DrawImageInt(*tab_inactive_image->image_l, 0, 0);
   canvas->TileImageInt(*tab_inactive_image->image_c,
                        tab_inactive_image->l_width, 0,
                        width() - tab_inactive_image->l_width -
                            tab_inactive_image->r_width,
                        height());
   canvas->DrawImageInt(*tab_inactive_image->image_r,
@@ skipping 120 matching lines @@
       rb.GetImageSkiaNamed(IDR_TAB_ACTIVE_RIGHT_SEARCH);
   tab_active_search_.l_width = tab_active_search_.image_l->width();
   tab_active_search_.r_width = tab_active_search_.image_r->width();
 
   tab_inactive_.image_l = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetImageSkiaNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 }