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

Unified Diff: ui/gfx/skia_paint_util.h

Issue 2893083002: cc: Move SkShader construction to a single spot in PaintShader (Closed)
Patch Set: update Created 3 years, 7 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: ui/gfx/skia_paint_util.h
diff --git a/ui/gfx/skia_paint_util.h b/ui/gfx/skia_paint_util.h
index f7e5d82de725715374a30c7f66783ea782b2cf60..18ecb5a32c870b851153ebd6af72650e95b6dd73 100644
--- a/ui/gfx/skia_paint_util.h
+++ b/ui/gfx/skia_paint_util.h
@@ -25,24 +25,25 @@ class ImageSkiaRep;
// TODO(pkotwicz): Allow shader's local matrix to be changed after the shader
// is created.
//
-GFX_EXPORT sk_sp<cc::PaintShader> CreateImageRepShader(
+GFX_EXPORT std::unique_ptr<cc::PaintShader> CreateImageRepShader(
sky 2017/06/02 22:51:05 Include <memory>?
vmpstr 2017/06/05 21:02:07 Done.
const gfx::ImageSkiaRep& image_rep,
- cc::PaintShader::TileMode tile_mode,
+ SkShader::TileMode tile_mode,
const SkMatrix& local_matrix);
// Creates a bitmap shader for the image rep with the passed in scale factor.
-GFX_EXPORT sk_sp<cc::PaintShader> CreateImageRepShaderForScale(
+GFX_EXPORT std::unique_ptr<cc::PaintShader> CreateImageRepShaderForScale(
const gfx::ImageSkiaRep& image_rep,
- cc::PaintShader::TileMode tile_mode,
+ SkShader::TileMode tile_mode,
const SkMatrix& local_matrix,
SkScalar scale);
// Creates a vertical gradient shader. The caller owns the shader.
// Example usage to avoid leaks:
-GFX_EXPORT sk_sp<cc::PaintShader> CreateGradientShader(int start_point,
- int end_point,
- SkColor start_color,
- SkColor end_color);
+GFX_EXPORT std::unique_ptr<cc::PaintShader> CreateGradientShader(
+ int start_point,
+ int end_point,
+ SkColor start_color,
+ SkColor end_color);
// Creates a draw looper to generate |shadows|. The caller owns the draw looper.
// NULL is returned if |shadows| is empty since no draw looper is needed in

Powered by Google App Engine
This is Rietveld 408576698