| Index: include/effects/SkPerlinNoiseShader.h
|
| diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
|
| index 2937926cd7b3dd184aaccff2effa6385b0023bfc..fc6748462ceedbb5c119384fa0931ff598e2b1b6 100644
|
| --- a/include/effects/SkPerlinNoiseShader.h
|
| +++ b/include/effects/SkPerlinNoiseShader.h
|
| @@ -103,9 +103,6 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader)
|
|
|
| protected:
|
| -#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
| - SkPerlinNoiseShader(SkReadBuffer&);
|
| -#endif
|
| virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
|
|
| @@ -115,16 +112,13 @@ private:
|
| const SkISize* tileSize);
|
| virtual ~SkPerlinNoiseShader();
|
|
|
| - // TODO (scroggo): Once all SkShaders are created from a factory, and we have removed the
|
| - // constructor that creates SkPerlinNoiseShader from an SkReadBuffer, several fields can
|
| - // be made constant.
|
| - /*const*/ SkPerlinNoiseShader::Type fType;
|
| - /*const*/ SkScalar fBaseFrequencyX;
|
| - /*const*/ SkScalar fBaseFrequencyY;
|
| - /*const*/ int fNumOctaves;
|
| - /*const*/ SkScalar fSeed;
|
| - /*const*/ SkISize fTileSize;
|
| - /*const*/ bool fStitchTiles;
|
| + const SkPerlinNoiseShader::Type fType;
|
| + const SkScalar fBaseFrequencyX;
|
| + const SkScalar fBaseFrequencyY;
|
| + const int fNumOctaves;
|
| + const SkScalar fSeed;
|
| + const SkISize fTileSize;
|
| + const bool fStitchTiles;
|
|
|
| typedef SkShader INHERITED;
|
| };
|
|
|