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

Unified Diff: ui/views/controls/scrollbar/cocoa_scroll_bar.mm

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years 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
« no previous file with comments | « ui/views/controls/progress_bar.cc ('k') | ui/views/controls/scrollbar/overlay_scroll_bar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/scrollbar/cocoa_scroll_bar.mm
diff --git a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
index 40390cd1b95227b67b4369d2cb1166805f861ab6..1f2f2244bea43b357b457f24e122409b10216299 100644
--- a/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
+++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.mm
@@ -122,9 +122,9 @@ void CocoaScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
}
gfx::Rect local_bounds(GetLocalBounds());
- SkPaint paint;
+ CdlPaint paint;
paint.setAntiAlias(true);
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(CdlPaint::kFill_Style);
paint.setColor(thumb_color);
const SkScalar radius =
std::min(local_bounds.width(), local_bounds.height());
@@ -256,14 +256,14 @@ void CocoaScrollBar::OnPaint(gfx::Canvas* canvas) {
gradient_bounds[0].set(track_rect.x(), track_rect.y());
gradient_bounds[1].set(track_rect.right(), track_rect.y());
}
- SkPaint gradient;
- gradient.setShader(SkGradientShader::MakeLinear(
+ CdlPaint gradient;
+ gradient.setShader(CdlShader::WrapSkShader(SkGradientShader::MakeLinear(
gradient_bounds, kScrollerTrackGradientColors, nullptr,
- arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode));
+ arraysize(kScrollerTrackGradientColors), SkShader::kClamp_TileMode)));
canvas->DrawRect(track_rect, gradient);
// Draw the inner border: top if horizontal, left if vertical.
- SkPaint paint;
+ CdlPaint paint;
paint.setColor(kScrollerTrackInnerBorderColor);
gfx::Rect inner_border(track_rect);
if (IsHorizontal())
« no previous file with comments | « ui/views/controls/progress_bar.cc ('k') | ui/views/controls/scrollbar/overlay_scroll_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698