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

third_party/WebKit/Source/platform/graphics/PicturePattern.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/PicturePattern.h"
 
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace blink {
 
-PassRefPtr<PicturePattern> PicturePattern::create(PassRefPtr<SkPicture> picture,
+PassRefPtr<PicturePattern> PicturePattern::create(PassRefPtr<const SkPicture> picture,
     RepeatMode repeatMode)
 {
     return adoptRef(new PicturePattern(picture, repeatMode));
 }
 
-PicturePattern::PicturePattern(PassRefPtr<SkPicture> picture, RepeatMode mode)
+PicturePattern::PicturePattern(PassRefPtr<const SkPicture> picture, RepeatMode mode)
     : Pattern(mode)
     , m_tilePicture(picture)
 {
     // All current clients use RepeatModeXY, so we only support this mode for now.
     ASSERT(isRepeatXY());
 
     // FIXME: we don't have a good way to account for DL memory utilization.
 }
 
 PicturePattern::~PicturePattern()
 {
 }
 
 PassRefPtr<SkShader> PicturePattern::createShader()
 {
     SkMatrix localMatrix = affineTransformToSkMatrix(m_patternSpaceTransformation);
     SkRect tileBounds = m_tilePicture->cullRect();
 
-    return adoptRef(SkShader::MakePictureShader(adoptSkSp<SkPicture>(m_tilePicture),
+    return adoptRef(SkShader::CreatePictureShader(m_tilePicture.get(),
         SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix, &tileBounds));
 }
 
 } // namespace blink