diff options
| author |  Stan Iliev <stani@google.com> | 2017-05-25 22:07:16 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 22:30:19 +0000 |
| commit | d8872be505c5c9c48072fe62c244e53e9b7334f1 (patch) | |
| tree | ef6ae54d394f1bf0794393c42129811b93d0f6be /src/shaders/SkImageShader.h | |
| parent | 5b474d36238e38642add8d4b54cb9ac80935262b (diff) | |
Revert "Relocate shaders to own dir"
This reverts commit fabe0b26d05624ce7374f6ca89bd66df6142534e.
Reason for revert: Last android roll failed with "external/skia/src/effects/SkGaussianEdgeShader.h:11:10: fatal error: 'SkShaderBase.h' file not found"
Original change's description:
> Relocate shaders to own dir
>
> Consolidate all shader impls under src/shaders/.
>
> Change-Id: I450e37541214704c1ad9e379d9d753b7cc62fac3
> Reviewed-on: https://skia-review.googlesource.com/17927
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Herb Derby <herb@google.com>
>
TBR=mtklein@google.com,herb@google.com,fmalita@chromium.org,reed@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Idbb2b75053969df1dad9d8ce0217cd39189b9ddb
Reviewed-on: https://skia-review.googlesource.com/18020
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Stan Iliev <stani@google.com>
Diffstat (limited to 'src/shaders/SkImageShader.h')
| -rw-r--r-- | src/shaders/SkImageShader.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/shaders/SkImageShader.h b/src/shaders/SkImageShader.h deleted file mode 100644 index 7be982c5c6..0000000000 --- a/src/shaders/SkImageShader.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkImageShader_DEFINED -#define SkImageShader_DEFINED - -#include "SkBitmapProcShader.h" -#include "SkColorSpaceXformer.h" -#include "SkImage.h" -#include "SkShaderBase.h" - -class SkImageShader : public SkShaderBase { -public: - static sk_sp<SkShader> Make(sk_sp<SkImage>, TileMode tx, TileMode ty, - const SkMatrix* localMatrix); - - bool isOpaque() const override; - - SK_TO_STRING_OVERRIDE() - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageShader) - -#if SK_SUPPORT_GPU - sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const override; -#endif - - SkImageShader(sk_sp<SkImage>, TileMode tx, TileMode ty, const SkMatrix* localMatrix); - -protected: - void flatten(SkWriteBuffer&) const override; - Context* onMakeContext(const ContextRec&, SkArenaAlloc* storage) const override; -#ifdef SK_SUPPORT_LEGACY_SHADER_ISABITMAP - bool onIsABitmap(SkBitmap*, SkMatrix*, TileMode*) const override; -#endif - SkImage* onIsAImage(SkMatrix*, TileMode*) const override; - - bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, - const SkMatrix& ctm, const SkPaint&, const SkMatrix*) const override; - - sk_sp<SkShader> onMakeColorSpace(SkColorSpaceXformer* xformer) const override { - return xformer->apply(fImage.get())->makeShader(fTileModeX, fTileModeY, - &this->getLocalMatrix()); - } - - sk_sp<SkImage> fImage; - const TileMode fTileModeX; - const TileMode fTileModeY; - -private: - friend class SkShaderBase; - - typedef SkShaderBase INHERITED; -}; - -#endif |