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

Unified Diff: ui/gfx/canvas.cc

Issue 1849763002: Use sk_sp-based shader setting APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review constness + rebase Created 4 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 895bf4f6c78adf307d93c72f7d1089bf7bafcfef..b88fd2d55128a7e68c91c20b20205a2ca8ff61af 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -500,9 +500,8 @@ bool Canvas::InitSkPaintForTiling(const ImageSkia& image,
shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
- // setShader() takes ownership of the created shader.
paint->setShader(CreateImageRepShader(image_rep, SkShader::kRepeat_TileMode,
danakj 2016/03/31 19:50:02 How does it work? CreateIRShader returns a skia::R
f(malita) 2016/03/31 19:51:44 I had the exact same headscratch, but sync your tr
danakj 2016/03/31 19:53:22 Oh ok, codesearch isn't updated yet. LGTM
- shader_scale).get());
+ shader_scale));
paint->setXfermodeMode(SkXfermode::kSrcOver_Mode);
return true;
}
@@ -555,8 +554,6 @@ void Canvas::DrawImageIntHelper(const ImageSkiaRep& image_rep,
shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
- // Set up our paint to use the shader & release our reference (now just owned
- // by the paint).
SkPaint p(paint);
p.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
p.setShader(CreateImageRepShaderForScale(
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698