diff options
| author |  reed <reed@google.com> | 2015-09-25 02:31:09 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-25 02:31:09 -0700 |
| commit | fe05707c356d2a8c2c69222591d4cafbd456b4e5 (patch) | |
| tree | c490b4a707c52d58fc1bcadf1fb4d5d816db392f /src/image/SkImage.cpp | |
| parent | 00d6e515e5835f7df6163ceb5f5ceb1770552bf7 (diff) | |
Revert[2] of add ImageShader, sharing code with its Bitmap cousin
Adjustment from previous land : runtime check for npot-support when texture is requested for tiling.
(patchset #10 id:180001 of https://codereview.chromium.org/1342113002/ )
This reverts commit f2608513626264459a00388537175600b515cae2.
BUG=skia:4365
Review URL: https://codereview.chromium.org/1352293002
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 { |