| Index: chrome/common/extensions/extension_action.cc
|
| ===================================================================
|
| --- chrome/common/extensions/extension_action.cc (revision 82144)
|
| +++ chrome/common/extensions/extension_action.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -159,8 +159,8 @@
|
| 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->AsCanvasSkia()->skia_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();
|
| @@ -171,24 +171,26 @@
|
| SkBitmap* gradient_center = resource_bundle.GetBitmapNamed(
|
| IDR_BROWSER_ACTION_BADGE_CENTER);
|
|
|
| - canvas->AsCanvasSkia()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop);
|
| + canvas->AsCanvasSkia()->skia_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->AsCanvasSkia()->skia_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()->skia_canvas()->clipRect(rect);
|
| + canvas->AsCanvasSkia()->skia_canvas()->drawText(
|
| + text.c_str(), text.size(),
|
| + rect.fLeft + (rect.width() - text_width) / 2,
|
| + rect.fTop + kTextSize + kTopTextPadding,
|
| + *text_paint);
|
| canvas->Restore();
|
| }
|
|
|