Revert of Add sk_sp helpers and switch Blink SkShader clients to the new APIs

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

Index: third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
index d390aecf106a47efa55f129a512942c8f2cdc85f..32f4aa92910d0cbfee0cbbb372ef28af52f425e3 100644
--- a/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImagePattern.cpp
@@ -33,13 +33,13 @@
 PassRefPtr<SkShader> ImagePattern::createShader()
 {
     if (!m_tileImage)
-        return adoptRef(SkShader::MakeColorShader(SK_ColorTRANSPARENT));
+        return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT));
 
     SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);
 
     if (isRepeatXY()) {
         // Fast path: for repeatXY we just return a shader from the original image.
-        return adoptRef(m_tileImage->makeShader(SkShader::kRepeat_TileMode,
+        return adoptRef(m_tileImage->newShader(SkShader::kRepeat_TileMode,
             SkShader::kRepeat_TileMode, &localMatrix));
     }
 
@@ -61,7 +61,7 @@
     RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul(
         m_tileImage->width() + expandW, m_tileImage->height() + expandH));
     if (!surface)
-        return adoptRef(SkShader::MakeColorShader(SK_ColorTRANSPARENT));
+        return adoptRef(SkShader::CreateColorShader(SK_ColorTRANSPARENT));
 
     surface->getCanvas()->clear(SK_ColorTRANSPARENT);
     SkPaint paint;
@@ -69,7 +69,7 @@
     surface->getCanvas()->drawImage(m_tileImage.get(), 0, 0, &paint);
     RefPtr<SkImage> expandedImage = adoptRef(surface->newImageSnapshot());
 
-    return adoptRef(expandedImage->makeShader(tileModeX, tileModeY, &localMatrix));
+    return adoptRef(expandedImage->newShader(tileModeX, tileModeY, &localMatrix));
 }
 
 bool ImagePattern::isTextureBacked() const