Revert of cc: Move SkShader construction to a single spot in PaintShader

third_party/WebKit/Source/platform/graphics/ImagePattern.cpp

 // Copyright 2014 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.
 
 #include "platform/graphics/ImagePattern.h"
 
 #include "platform/graphics/Image.h"
 #include "platform/graphics/paint/PaintShader.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ skipping 11 matching lines @@
     : Pattern(repeat_mode), tile_image_(image->ImageForCurrentFrame()) {
   previous_local_matrix_.setIdentity();
 }
 
 bool ImagePattern::IsLocalMatrixChanged(const SkMatrix& local_matrix) const {
   if (IsRepeatXY())
     return Pattern::IsLocalMatrixChanged(local_matrix);
   return local_matrix != previous_local_matrix_;
 }
 
-std::unique_ptr<PaintShader> ImagePattern::CreateShader(
-    const SkMatrix& local_matrix) {
-  if (!tile_image_) {
-    return PaintShader::MakeColor(SK_ColorTRANSPARENT);
-  }
+sk_sp<PaintShader> ImagePattern::CreateShader(const SkMatrix& local_matrix) {
+  if (!tile_image_)
+    return WrapSkShader(SkShader::MakeColorShader(SK_ColorTRANSPARENT));
 
   if (IsRepeatXY()) {
     // Fast path: for repeatXY we just return a shader from the original image.
-    return PaintShader::MakeImage(tile_image_, SkShader::kRepeat_TileMode,
-                                  SkShader::kRepeat_TileMode, &local_matrix);
+    return MakePaintShaderImage(tile_image_, SkShader::kRepeat_TileMode,
+                                SkShader::kRepeat_TileMode, &local_matrix);
   }
 
   // Skia does not have a "draw the tile only once" option. Clamp_TileMode
   // repeats the last line of the image after drawing one tile. To avoid
   // filling the space with arbitrary pixels, this workaround forces the
   // image to have a line of transparent pixels on the "repeated" edge(s),
   // thus causing extra space to be transparent filled.
   SkShader::TileMode tile_mode_x =
       IsRepeatX() ? SkShader::kRepeat_TileMode : SkShader::kClamp_TileMode;
   SkShader::TileMode tile_mode_y =
@@ skipping 16 matching lines @@
   // Note: we use a picture *image* (as opposed to a picture *shader*) to
   // lock-in the resolution (for 1px padding in particular).
   sk_sp<SkImage> tile_image = SkImage::MakeFromPicture(
       recorder.finishRecordingAsPicture(), tile_size, nullptr, nullptr,
       SkImage::BitDepth::kU8, SkColorSpace::MakeSRGB());
 
   previous_local_matrix_ = local_matrix;
   SkMatrix adjusted_matrix(local_matrix);
   adjusted_matrix.postTranslate(-border_pixel_x, -border_pixel_y);
 
-  return PaintShader::MakeImage(std::move(tile_image), tile_mode_x, tile_mode_y,
-                                &adjusted_matrix);
+  return MakePaintShaderImage(std::move(tile_image), tile_mode_x, tile_mode_y,
+                              &adjusted_matrix);
 }
 
 bool ImagePattern::IsTextureBacked() const {
   return tile_image_ && tile_image_->isTextureBacked();
 }
 
 }  // namespace blink