diff options
| author |  reed <reed@google.com> | 2015-09-15 14:46:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-15 14:46:27 -0700 |
| commit | 013e9e3bb0495ab0b5aff011429a6ac983464d34 (patch) | |
| tree | e017fb97e23904294b840075bc10a57ec1ff2213 /src/core/SkBitmapProcShader.cpp | |
| parent | 0d705a487318d41c95be9849e355f7383e67dc96 (diff) | |
move SkBitmapProvider to its own file
BUG=skia:
Review URL: https://codereview.chromium.org/1346713002
Diffstat (limited to 'src/core/SkBitmapProcShader.cpp')
| -rw-r--r-- | src/core/SkBitmapProcShader.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp index 36bfb1e7d6..125f480f72 100644 --- a/src/core/SkBitmapProcShader.cpp +++ b/src/core/SkBitmapProcShader.cpp @@ -7,6 +7,7 @@ #include "SkBitmapProcShader.h" #include "SkBitmapProcState.h" +#include "SkBitmapProvider.h" #include "SkColorPriv.h" #include "SkErrorInternals.h" #include "SkPixelRef.h" @@ -78,7 +79,7 @@ bool SkBitmapProcShader::isOpaque() const { SkShader::Context* SkBitmapProcShader::MakeContext(const SkShader& shader, TileMode tmx, TileMode tmy, - const SkBitmap& bitmap, + const SkBitmapProvider& provider, const ContextRec& rec, void* storage) { SkMatrix totalInverse; // Do this first, so we know the matrix can be inverted. @@ -87,8 +88,7 @@ SkShader::Context* SkBitmapProcShader::MakeContext(const SkShader& shader, } void* stateStorage = (char*)storage + sizeof(BitmapProcShaderContext); - SkBitmapProcState* state = new (stateStorage) SkBitmapProcState(SkBitmapProvider(bitmap), - tmx, tmy); + SkBitmapProcState* state = new (stateStorage) SkBitmapProcState(provider, tmx, tmy); SkASSERT(state); if (!state->chooseProcs(totalInverse, *rec.fPaint)) { @@ -100,7 +100,8 @@ SkShader::Context* SkBitmapProcShader::MakeContext(const SkShader& shader, } SkShader::Context* SkBitmapProcShader::onCreateContext(const ContextRec& rec, void* storage) const { - return MakeContext(*this, (TileMode)fTileModeX, (TileMode)fTileModeY, fRawBitmap, rec, storage); + return MakeContext(*this, (TileMode)fTileModeX, (TileMode)fTileModeY, + SkBitmapProvider(fRawBitmap), rec, storage); } SkBitmapProcShader::BitmapProcShaderContext::BitmapProcShaderContext(const SkShader& shader, |