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

Unified Diff: chrome/browser/chromeos/login/rounded_rect_painter.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/browser/chromeos/login/rounded_rect_painter.cc
diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc
index 883f1a757662ddba3f18b071a0cc9720abf0c16b..47bcdcb6703b708374023637e10e4f1b556db6b7 100644
--- a/chrome/browser/chromeos/login/rounded_rect_painter.cc
+++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc
@@ -53,7 +53,7 @@ static void DrawRoundedRect(
} else {
paint.setColor(top_color);
}
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
if (stroke_color != 0) {
// Expand rect by 0.5px so resulting stroke will take the whole pixel.
@@ -66,7 +66,7 @@ static void DrawRoundedRect(
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(SkIntToScalar(SK_Scalar1));
paint.setColor(stroke_color);
- canvas->AsCanvasSkia()->drawRoundRect(
+ canvas->GetSkCanvas()->drawRoundRect(
rect,
SkIntToScalar(corner_radius), SkIntToScalar(corner_radius),
paint);
@@ -91,7 +91,7 @@ static void DrawRoundedRectShadow(
rect.set(
SkIntToScalar(x + shadow / 2), SkIntToScalar(y + shadow / 2),
SkIntToScalar(x + w - shadow / 2), SkIntToScalar(y + h - shadow / 2));
- canvas->AsCanvasSkia()->drawRoundRect(
+ canvas->GetSkCanvas()->drawRoundRect(
rect,
SkIntToScalar(corner_radius), SkIntToScalar(corner_radius),
paint);
@@ -112,7 +112,7 @@ static void DrawRectWithBorder(int w,
if (padding > 0) {
SkPaint paint;
paint.setColor(padding_color);
- canvas->AsCanvasSkia()->drawRectCoords(
+ canvas->GetSkCanvas()->drawRectCoords(
SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(w), SkIntToScalar(h),
paint);
}
@@ -207,12 +207,12 @@ class RoundedBackground : public views::Background {
paint.setStyle(SkPaint::kFill_Style);
paint.setFlags(SkPaint::kAntiAlias_Flag);
paint.setColor(get_color());
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
// Redraw boundary region with correspoinding color.
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(SkIntToScalar(stroke_width_));
paint.setColor(stroke_color_);
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
}
private:

Powered by Google App Engine
This is Rietveld 408576698