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

Side by Side Diff: ui/views/controls/button/label_button_border.cc

Issue 1849213002: Remove SK_SUPPORT_LEGACY_XFERMODE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adopt the pointer but don't ref it Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/button/label_button_border.h" 5 #include "ui/views/controls/button/label_button_border.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/skia/include/core/SkPaint.h" 8 #include "third_party/skia/include/core/SkPaint.h"
9 #include "third_party/skia/include/effects/SkArithmeticMode.h" 9 #include "third_party/skia/include/effects/SkArithmeticMode.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 if (animation && animation->is_animating()) { 140 if (animation && animation->is_animating()) {
141 // Linearly interpolate background and foreground painters during animation. 141 // Linearly interpolate background and foreground painters during animation.
142 const SkRect sk_rect = gfx::RectToSkRect(rect); 142 const SkRect sk_rect = gfx::RectToSkRect(rect);
143 canvas->sk_canvas()->saveLayer(&sk_rect, NULL); 143 canvas->sk_canvas()->saveLayer(&sk_rect, NULL);
144 state = native_theme_delegate->GetBackgroundThemeState(&extra); 144 state = native_theme_delegate->GetBackgroundThemeState(&extra);
145 PaintHelper(this, canvas, state, rect, extra); 145 PaintHelper(this, canvas, state, rect, extra);
146 146
147 SkPaint paint; 147 SkPaint paint;
148 double scale = animation->GetCurrentValue(); 148 double scale = animation->GetCurrentValue();
149 skia::RefPtr<SkXfermode> sk_arith_xfer = 149 sk_sp<SkXfermode> sk_arith_xfer =
150 skia::AdoptRef(SkArithmeticMode::Create(0.0f, scale, 1.0 - scale, 0.0)); 150 SkArithmeticMode::Make(0.0f, scale, 1.0 - scale, 0.0);
151 paint.setXfermode(sk_arith_xfer.get()); 151 paint.setXfermode(sk_arith_xfer);
f(malita) 2016/04/01 18:16:01 std::move or inline.
152 canvas->sk_canvas()->saveLayer(&sk_rect, &paint); 152 canvas->sk_canvas()->saveLayer(&sk_rect, &paint);
153 state = native_theme_delegate->GetForegroundThemeState(&extra); 153 state = native_theme_delegate->GetForegroundThemeState(&extra);
154 PaintHelper(this, canvas, state, rect, extra); 154 PaintHelper(this, canvas, state, rect, extra);
155 canvas->sk_canvas()->restore(); 155 canvas->sk_canvas()->restore();
156 156
157 canvas->sk_canvas()->restore(); 157 canvas->sk_canvas()->restore();
158 } else { 158 } else {
159 PaintHelper(this, canvas, state, rect, extra); 159 PaintHelper(this, canvas, state, rect, extra);
160 } 160 }
161 } 161 }
(...skipping 14 matching lines...) Expand all
176 return painters_[focused ? 1 : 0][state].get(); 176 return painters_[focused ? 1 : 0][state].get();
177 } 177 }
178 178
179 void LabelButtonAssetBorder::SetPainter(bool focused, 179 void LabelButtonAssetBorder::SetPainter(bool focused,
180 Button::ButtonState state, 180 Button::ButtonState state,
181 Painter* painter) { 181 Painter* painter) {
182 painters_[focused ? 1 : 0][state].reset(painter); 182 painters_[focused ? 1 : 0][state].reset(painter);
183 } 183 }
184 184
185 } // namespace views 185 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698