diff options
| author |  reed <reed@google.com> | 2015-09-30 12:21:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-30 12:21:45 -0700 |
| commit | 856e9d921462136da8562f8f122d42e114cd4710 (patch) | |
| tree | 9ebc00a92f5aacdd54d00c528fa3ed19f48f6fd6 /src/image/SkImage.cpp | |
| parent | 8a6697af95b340aad6dee7e6228048fa305c1e59 (diff) | |
Revert[4] of add ImageShader, sharing code with its Bitmap cousin
Now with GrTextureMaker subclasses to handle npot usage.
This reverts commit 476506d070dbc59b158acc1a00c34bff95ab2968.
BUG=skia:
Review URL: https://codereview.chromium.org/1370223002
Diffstat (limited to 'src/image/SkImage.cpp')
| -rw-r--r-- | src/image/SkImage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index b639821a95..ee76a7ea39 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -11,6 +11,7 @@ #include "SkData.h" #include "SkImageGenerator.h" #include "SkImagePriv.h" +#include "SkImageShader.h" #include "SkImage_Base.h" #include "SkNextID.h" #include "SkPixelRef.h" @@ -69,7 +70,7 @@ void SkImage::preroll(GrContext* ctx) const { SkShader* SkImage::newShader(SkShader::TileMode tileX, SkShader::TileMode tileY, const SkMatrix* localMatrix) const { - return as_IB(this)->onNewShader(tileX, tileY, localMatrix); + return SkImageShader::Create(this, tileX, tileY, localMatrix); } SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const { |