Index: ui/gfx/skia_util.h |
diff --git a/ui/gfx/skia_util.h b/ui/gfx/skia_util.h |
index 44c9a09e0330dedbb3ee3d004b50142b27dc52ae..d6be1b26a266f8491d3c4f37d6afa73651bba3f4 100644 |
--- a/ui/gfx/skia_util.h |
+++ b/ui/gfx/skia_util.h |
@@ -8,9 +8,9 @@ |
#include <string> |
#include <vector> |
-#include "skia/ext/refptr.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "third_party/skia/include/core/SkRect.h" |
+#include "third_party/skia/include/core/SkRefCnt.h" |
#include "third_party/skia/include/core/SkShader.h" |
#include "ui/gfx/geometry/quad_f.h" |
#include "ui/gfx/geometry/size.h" |
@@ -48,13 +48,13 @@ GFX_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform, |
// TODO(pkotwicz): Allow shader's local matrix to be changed after the shader |
// is created. |
// |
-GFX_EXPORT skia::RefPtr<SkShader> CreateImageRepShader( |
+GFX_EXPORT sk_sp<SkShader> CreateImageRepShader( |
const gfx::ImageSkiaRep& image_rep, |
SkShader::TileMode tile_mode, |
const SkMatrix& local_matrix); |
// Creates a bitmap shader for the image rep with the passed in scale factor. |
-GFX_EXPORT skia::RefPtr<SkShader> CreateImageRepShaderForScale( |
+GFX_EXPORT sk_sp<SkShader> CreateImageRepShaderForScale( |
const gfx::ImageSkiaRep& image_rep, |
SkShader::TileMode tile_mode, |
const SkMatrix& local_matrix, |
@@ -62,15 +62,15 @@ GFX_EXPORT skia::RefPtr<SkShader> CreateImageRepShaderForScale( |
// Creates a vertical gradient shader. The caller owns the shader. |
// Example usage to avoid leaks: |
-GFX_EXPORT skia::RefPtr<SkShader> CreateGradientShader(int start_point, |
- int end_point, |
- SkColor start_color, |
- SkColor end_color); |
+GFX_EXPORT sk_sp<SkShader> 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 |
// this case. |
-GFX_EXPORT skia::RefPtr<SkDrawLooper> CreateShadowDrawLooper( |
+GFX_EXPORT sk_sp<SkDrawLooper> CreateShadowDrawLooper( |
const std::vector<ShadowValue>& shadows); |
// Returns true if the two bitmaps contain the same pixels. |