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

Unified Diff: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h

Issue 2625403002: Prefer newly added SkPaint::refFoo() over getFoo() (Closed)
Patch Set: inline SkComposeImageFilter construction Created 3 years, 11 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: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
index 529f705b6fd2266d522860b6ad5bd86665017518..281f1d5f36cfc603343b36202ddd50b8a879db12 100644
--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h
@@ -443,13 +443,10 @@ void BaseRenderingContext2D::compositedDraw(
if (filter) {
SkPaint foregroundPaint =
*state().getPaint(paintType, DrawForegroundOnly, imageType);
- sk_sp<SkImageFilter> composedFilter =
- sk_ref_sp(foregroundPaint.getImageFilter());
- composedFilter = SkComposeImageFilter::Make(
- std::move(composedFilter), sk_ref_sp(shadowPaint.getImageFilter()));
- composedFilter =
- SkComposeImageFilter::Make(std::move(composedFilter), filter);
- foregroundPaint.setImageFilter(std::move(composedFilter));
+ foregroundPaint.setImageFilter(SkComposeImageFilter::Make(
+ SkComposeImageFilter::Make(foregroundPaint.refImageFilter(),
+ shadowPaint.refImageFilter()),
+ filter));
c->setMatrix(ctm);
drawFunc(c, &foregroundPaint);
} else {
« no previous file with comments | « cc/output/software_renderer.cc ('k') | third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698