Revert 50784 - Canvas refactoring part 3....

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace {
 
 // Different platforms need slightly different constants to look good.
@@ skipping 88 matching lines @@
 
   SkColor text_color = GetBadgeTextColor(tab_id);
   SkColor background_color = GetBadgeBackgroundColor(tab_id);
 
   if (SkColorGetA(text_color) == 0x00)
     text_color = SK_ColorWHITE;
 
   if (SkColorGetA(background_color) == 0x00)
     background_color = SkColorSetARGB(255, 218, 0, 24);  // Default badge color.
 
-  canvas->AsCanvasSkia()->save();
+  canvas->save();
 
   SkPaint* text_paint = GetTextPaint();
   text_paint->setColor(text_color);
 
   // Calculate text width. We clamp it to a max size.
   SkScalar text_width = text_paint->measureText(text.c_str(), text.size());
   text_width = SkIntToScalar(
       std::min(kMaxTextWidth, SkScalarFloor(text_width)));
 
   // Calculate badge size. It is clamped to a min width just because it looks
@@ skipping 19 matching lines @@
     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());
     rect.fLeft = rect.fRight - badge_width;
   }
 
   SkPaint rect_paint;
   rect_paint.setStyle(SkPaint::kFill_Style);
   rect_paint.setAntiAlias(true);
   rect_paint.setColor(background_color);
-  canvas->AsCanvasSkia()->drawRoundRect(rect, SkIntToScalar(2), SkIntToScalar(2),
-                                        rect_paint);
+  canvas->drawRoundRect(rect, SkIntToScalar(2), SkIntToScalar(2), rect_paint);
 
   // Overlay the gradient. It is stretchy, so we do this in three parts.
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
   SkBitmap* gradient_left = resource_bundle.GetBitmapNamed(
       IDR_BROWSER_ACTION_BADGE_LEFT);
   SkBitmap* gradient_right = resource_bundle.GetBitmapNamed(
       IDR_BROWSER_ACTION_BADGE_RIGHT);
   SkBitmap* gradient_center = resource_bundle.GetBitmapNamed(
       IDR_BROWSER_ACTION_BADGE_CENTER);
 
-  canvas->AsCanvasSkia()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop);
+  canvas->drawBitmap(*gradient_left, rect.fLeft, rect.fTop);
   canvas->TileImageInt(*gradient_center,
       SkScalarFloor(rect.fLeft) + gradient_left->width(),
       SkScalarFloor(rect.fTop),
       SkScalarFloor(rect.width()) - gradient_left->width() -
                     gradient_right->width(),
       SkScalarFloor(rect.height()));
-  canvas->AsCanvasSkia()->drawBitmap(*gradient_right,
+  canvas->drawBitmap(*gradient_right,
       rect.fRight - SkIntToScalar(gradient_right->width()), rect.fTop);
 
   // Finally, draw the text centered within the badge. We set a clip in case the
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
-  canvas->AsCanvasSkia()->clipRect(rect);
-  canvas->AsCanvasSkia()->drawText(text.c_str(), text.size(),
-                                   rect.fLeft + (rect.width() - text_width) / 2,
-                                   rect.fTop + kTextSize + kTopTextPadding,
-                                   *text_paint);
-  canvas->AsCanvasSkia()->restore();
+  canvas->clipRect(rect);
+  canvas->drawText(text.c_str(), text.size(),
+                   rect.fLeft + (rect.width() - text_width) / 2,
+                   rect.fTop + kTextSize + kTopTextPadding,
+                   *text_paint);
+  canvas->restore();
 }