Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1263)

Unified Diff: third_party/WebKit/Source/platform/graphics/PicturePattern.cpp

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2846d35367086d779948b9890b5a5569c5a74d7f 100644
--- a/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
+++ b/third_party/WebKit/Source/platform/graphics/PicturePattern.cpp
@@ -5,17 +5,19 @@
#include "platform/graphics/PicturePattern.h"
#include "platform/graphics/skia/SkiaUtils.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_picture.h"
+#include "skia/ext/cdl_shader.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<CdlPicture> picture,
RepeatMode repeatMode) {
return adoptRef(new PicturePattern(std::move(picture), repeatMode));
}
-PicturePattern::PicturePattern(sk_sp<SkPicture> picture, RepeatMode mode)
+PicturePattern::PicturePattern(sk_sp<CdlPicture> 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 +27,12 @@ PicturePattern::PicturePattern(sk_sp<SkPicture> picture, RepeatMode mode)
PicturePattern::~PicturePattern() {}
-sk_sp<SkShader> PicturePattern::createShader(const SkMatrix& localMatrix) {
+sk_sp<CdlShader> PicturePattern::createShader(const SkMatrix& localMatrix) {
SkRect tileBounds = m_tilePicture->cullRect();
- return SkShader::MakePictureShader(m_tilePicture, SkShader::kRepeat_TileMode,
- SkShader::kRepeat_TileMode, &localMatrix,
- &tileBounds);
+ return CdlShader::MakePictureShader(m_tilePicture, SkShader::kRepeat_TileMode,
+ SkShader::kRepeat_TileMode, &localMatrix,
+ &tileBounds);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698