Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/gfx/skia_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_SKIA_UTIL_H_
 #define UI_GFX_SKIA_UTIL_H_
 
 #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"
 #include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 class SkDrawLooper;
 
 namespace gfx {
 
@@ skipping 17 matching lines @@
 GFX_EXPORT void TransformToFlattenedSkMatrix(const gfx::Transform& transform,
                                              SkMatrix* flattened);
 
 // Creates a bitmap shader for the image rep with the image rep's scale factor.
 // Sets the created shader's local matrix such that it displays the image rep at
 // the correct scale factor.
 // The shader's local matrix should not be changed after the shader is created.
 // 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,
     SkScalar scale);
 
 // 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.
 GFX_EXPORT bool BitmapsAreEqual(const SkBitmap& bitmap1,
                                 const SkBitmap& bitmap2);
 
 // Converts Skia ARGB format pixels in |skia| to RGBA.
 GFX_EXPORT void ConvertSkiaToRGBA(const unsigned char* skia,
                                   int pixel_width,
                                   unsigned char* rgba);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_SKIA_UTIL_H_