diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-24 15:33:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-24 19:56:15 +0000 |
| commit | 58a756435ca3700d9766a4580bb0771a9774f603 (patch) | |
| tree | 698e327baf54c7c449d019b95f51a553fbadc59c /src/image | |
| parent | aa13223f54d1f55ba702582f61359f8b43782730 (diff) | |
SkShaderBase
Introduce a private base class (SkShaderBase), to hide
implementation details from the public interface (SkShader).
Change-Id: If3ec26ca6abc9da20e3f139c11fdc023bdd85176
Reviewed-on: https://skia-review.googlesource.com/17241
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkImageShader.cpp | 7 | ||||
| -rw-r--r-- | src/image/SkImageShader.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/image/SkImageShader.cpp b/src/image/SkImageShader.cpp index 0dbf944948..751300e951 100644 --- a/src/image/SkImageShader.cpp +++ b/src/image/SkImageShader.cpp @@ -48,7 +48,8 @@ bool SkImageShader::isOpaque() const { return fImage->isOpaque(); } -SkShader::Context* SkImageShader::onMakeContext(const ContextRec& rec, SkArenaAlloc* alloc) const { +SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec, + SkArenaAlloc* alloc) const { return SkBitmapProcLegacyShader::MakeContext(*this, fTileModeX, fTileModeY, SkBitmapProvider(fImage.get(), rec.fDstColorSpace), rec, alloc); @@ -204,9 +205,9 @@ static sk_sp<SkFlattenable> SkBitmapProcShader_CreateProc(SkReadBuffer& buffer) return image ? image->makeShader(mx, my, &lm) : nullptr; } -SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkShader) +SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkShaderBase) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader) -SkFlattenable::Register("SkBitmapProcShader", SkBitmapProcShader_CreateProc, kSkShader_Type); +SkFlattenable::Register("SkBitmapProcShader", SkBitmapProcShader_CreateProc, kSkShaderBase_Type); SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END diff --git a/src/image/SkImageShader.h b/src/image/SkImageShader.h index 5274826e88..7be982c5c6 100644 --- a/src/image/SkImageShader.h +++ b/src/image/SkImageShader.h @@ -11,9 +11,9 @@ #include "SkBitmapProcShader.h" #include "SkColorSpaceXformer.h" #include "SkImage.h" -#include "SkShader.h" +#include "SkShaderBase.h" -class SkImageShader : public SkShader { +class SkImageShader : public SkShaderBase { public: static sk_sp<SkShader> Make(sk_sp<SkImage>, TileMode tx, TileMode ty, const SkMatrix* localMatrix); @@ -50,9 +50,9 @@ protected: const TileMode fTileModeY; private: - friend class SkShader; + friend class SkShaderBase; - typedef SkShader INHERITED; + typedef SkShaderBase INHERITED; }; #endif |