Rename paint data structures

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

Index: third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
index 597dac66f7872e50c19243a860a37e2b0a24ea24..44e76a97256fe9901495fed5e43e94b148338f89 100644
--- a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
+++ b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
@@ -4,18 +4,19 @@
 
 #include "platform/graphics/PicturePattern.h"
 
+#include "platform/graphics/paint/PaintFlags.h"
+#include "platform/graphics/paint/PaintRecord.h"
+#include "platform/graphics/paint/PaintShader.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(sk_sp<SkPicture> picture,
+PassRefPtr<PicturePattern> PicturePattern::create(sk_sp<PaintRecord> picture,
                                                   RepeatMode repeatMode) {
   return adoptRef(new PicturePattern(std::move(picture), repeatMode));
 }
 
-PicturePattern::PicturePattern(sk_sp<SkPicture> picture, RepeatMode mode)
+PicturePattern::PicturePattern(sk_sp<PaintRecord> picture, RepeatMode mode)
     : Pattern(mode), m_tilePicture(std::move(picture)) {
   // All current clients use RepeatModeXY, so we only support this mode for now.
   ASSERT(isRepeatXY());
@@ -25,12 +26,12 @@ PicturePattern::PicturePattern(sk_sp<SkPicture> picture, RepeatMode mode)
 
 PicturePattern::~PicturePattern() {}
 
-sk_sp<SkShader> PicturePattern::createShader(const SkMatrix& localMatrix) {
+sk_sp<PaintShader> PicturePattern::createShader(const SkMatrix& localMatrix) {
   SkRect tileBounds = m_tilePicture->cullRect();
 
-  return SkShader::MakePictureShader(m_tilePicture, SkShader::kRepeat_TileMode,
-                                     SkShader::kRepeat_TileMode, &localMatrix,
-                                     &tileBounds);
+  return MakePaintShaderRecord(m_tilePicture, SkShader::kRepeat_TileMode,
+                               SkShader::kRepeat_TileMode, &localMatrix,
+                               &tileBounds);
 }
 
 }  // namespace blink