Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: chrome/common/extensions/extension_action.cc

Issue 8122013: Allow CanvasSkia to bind to an existing SkCanvas. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 1 more fix Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/extension_action.cc
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index d9afab8d0b4217acff64370b2c596818a225ba9f..284da0e594a65c49f44d8e6bc141c0e2d40b816f 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -159,8 +159,8 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
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->GetSkCanvas()->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,24 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
SkBitmap* gradient_center = resource_bundle.GetBitmapNamed(
IDR_BROWSER_ACTION_BADGE_CENTER);
- canvas->AsCanvasSkia()->drawBitmap(*gradient_left, rect.fLeft, rect.fTop);
+ canvas->GetSkCanvas()->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->GetSkCanvas()->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->GetSkCanvas()->clipRect(rect);
+ canvas->GetSkCanvas()->drawText(text.c_str(), text.size(),
+ rect.fLeft + (rect.width() - text_width) / 2,
+ rect.fTop + kTextSize + kTopTextPadding,
+ *text_paint);
canvas->Restore();
}

Powered by Google App Engine
This is Rietveld 408576698