Revert 50784 - Canvas refactoring part 3....

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"
@@ skipping 348 matching lines @@
   } else {
     if (mini_title_animation_.get() && mini_title_animation_->is_animating())
       PaintInactiveTabBackgroundWithTitleChange(canvas);
     else
       PaintInactiveTabBackground(canvas);
 
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
       SkRect bounds;
       bounds.set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));
-      canvas->AsCanvasSkia()->saveLayerAlpha(
-          &bounds, static_cast<int>(throb_value * 0xff),
-          SkCanvas::kARGB_ClipLayer_SaveFlag);
-      canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255,
-                                       SkXfermode::kClear_Mode);
+      canvas->saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff),
+                             SkCanvas::kARGB_ClipLayer_SaveFlag);
+      canvas->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       PaintActiveTabBackground(canvas);
-      canvas->AsCanvasSkia()->restore();
+      canvas->restore();
     }
   }
 }
 
 void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
   // Render the inactive tab background. We'll use this for clipping.
-  gfx::CanvasSkia background_canvas(width(), height(), false);
+  gfx::Canvas background_canvas(width(), height(), false);
   PaintInactiveTabBackground(&background_canvas);
 
   SkBitmap background_image = background_canvas.ExtractBitmap();
 
   // Draw a radial gradient to hover_canvas.
   gfx::CanvasSkia hover_canvas(width(), height(), false);
   int radius = kMiniTitleChangeGradientRadius;
   int x0 = width() + radius - kMiniTitleChangeInitialXOffset;
   int x1 = radius;
   int x2 = -radius;
@@ skipping 23 matching lines @@
 
   // Draw the radial gradient clipped to the background into hover_image.
   SkBitmap hover_image = SkBitmapOperations::CreateMaskedBitmap(
       hover_canvas.ExtractBitmap(), background_image);
 
   // Draw the tab background to the canvas.
   canvas->DrawBitmapInt(background_image, 0, 0);
 
   // And then the gradient on top of that.
   if (mini_title_animation_->current_part_index() == 2) {
-    canvas->AsCanvasSkia()->saveLayerAlpha(
-        NULL, mini_title_animation_->CurrentValueBetween(255, 0));
+    canvas->saveLayerAlpha(NULL,
+                           mini_title_animation_->CurrentValueBetween(255, 0));
     canvas->DrawBitmapInt(hover_image, 0, 0);
-    canvas->AsCanvasSkia()->restore();
+    canvas->restore();
   } else {
     canvas->DrawBitmapInt(hover_image, 0, 0);
   }
 }
 
 void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   bool is_otr = data().off_the_record;
 
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.  These offsets represent the tab
@@ skipping 182 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;
 }