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

Unified Diff: views/controls/progress_bar.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: views/controls/progress_bar.cc
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 7cdebdbf984231f325511022e39e3d6dd2b77b12..0d70b7b00d66efab59af2d5165cfd0d7a90ba197 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -85,7 +85,7 @@ void FillRoundRect(gfx::Canvas* canvas,
// Need to unref shader, otherwise never deleted.
s->unref();
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
}
void FillRoundRect(gfx::Canvas* canvas,
@@ -106,7 +106,7 @@ void FillRoundRect(gfx::Canvas* canvas,
paint.setStyle(SkPaint::kFill_Style);
paint.setFlags(SkPaint::kAntiAlias_Flag);
paint.setColor(gradient_start_color);
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
}
}
@@ -124,7 +124,7 @@ void StrokeRoundRect(gfx::Canvas* canvas,
paint.setStyle(SkPaint::kStroke_Style);
paint.setFlags(SkPaint::kAntiAlias_Flag);
paint.setStrokeWidth(SkIntToScalar(stroke_width));
- canvas->AsCanvasSkia()->drawPath(path, paint);
+ canvas->GetSkCanvas()->drawPath(path, paint);
}
} // namespace
@@ -222,7 +222,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
// Draw inner stroke and shadow if wide enough.
if (progress_width > 2 * kBorderWidth) {
- canvas->AsCanvasSkia()->save();
+ canvas->GetSkCanvas()->save();
SkPath inner_path;
AddRoundRectPathWithPadding(
@@ -230,7 +230,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
kCornerRadius,
SkIntToScalar(kBorderWidth),
&inner_path);
- canvas->AsCanvasSkia()->clipPath(inner_path);
+ canvas->GetSkCanvas()->clipPath(inner_path);
// Draw bar inner stroke
StrokeRoundRect(canvas,
@@ -248,7 +248,7 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
bar_inner_shadow_color,
kBorderWidth);
- canvas->AsCanvasSkia()->restore();
+ canvas->GetSkCanvas()->restore();
}
// Draw bar stroke

Powered by Google App Engine
This is Rietveld 408576698