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

Unified Diff: ui/views/controls/button/label_button_border.cc

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/button/checkbox.cc ('k') | ui/views/controls/button/radio_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button_border.cc
diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc
index 2b0a18840d57a14074f6ff1733354657a6d9683f..e3dba3b021d0093af128da7b80b22f2dda2172ac 100644
--- a/ui/views/controls/button/label_button_border.cc
+++ b/ui/views/controls/button/label_button_border.cc
@@ -143,19 +143,19 @@ void LabelButtonAssetBorder::Paint(const View& view, gfx::Canvas* canvas) {
static_cast<uint8_t>(animation->CurrentValueBetween(0, 255));
const SkRect sk_rect = gfx::RectToSkRect(rect);
- SkAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
+ CdlAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
canvas->sk_canvas()->saveLayer(&sk_rect, nullptr);
{
// First, modulate the background by 1 - alpha.
- SkAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
+ CdlAutoCanvasRestore auto_restore(canvas->sk_canvas(), false);
canvas->sk_canvas()->saveLayerAlpha(&sk_rect, 255 - fg_alpha);
state = native_theme_delegate->GetBackgroundThemeState(&extra);
PaintHelper(this, canvas, state, rect, extra);
}
// Then modulate the foreground by alpha, and blend using kPlus_Mode.
- SkPaint paint;
+ CdlPaint paint;
paint.setAlpha(fg_alpha);
paint.setBlendMode(SkBlendMode::kPlus);
canvas->sk_canvas()->saveLayer(&sk_rect, &paint);
« no previous file with comments | « ui/views/controls/button/checkbox.cc ('k') | ui/views/controls/button/radio_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698