| Index: include/effects/SkPerlinNoiseShader.h
|
| diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
|
| index 96cad4684dffd5a73da63ad4fbdf2785ed9d3f51..2d9dfdd69ad99d14c6251b5462c435af0c7b1e05 100644
|
| --- a/include/effects/SkPerlinNoiseShader.h
|
| +++ b/include/effects/SkPerlinNoiseShader.h
|
| @@ -23,9 +23,9 @@
|
| http://www.w3.org/TR/SVG/filters.html#feTurbulenceElement
|
| */
|
| class SK_API SkPerlinNoiseShader : public SkShader {
|
| - struct PaintingData;
|
| public:
|
| struct StitchData;
|
| + struct PaintingData;
|
|
|
| /**
|
| * About the noise types : the difference between the 2 is just minor tweaks to the algorithm,
|
| @@ -77,7 +77,7 @@ public:
|
| class PerlinNoiseShaderContext : public SkShader::Context {
|
| public:
|
| PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&);
|
| - virtual ~PerlinNoiseShaderContext() {}
|
| + virtual ~PerlinNoiseShaderContext();
|
|
|
| virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
|
| virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE;
|
| @@ -85,12 +85,13 @@ public:
|
| private:
|
| SkPMColor shade(const SkPoint& point, StitchData& stitchData) const;
|
| SkScalar calculateTurbulenceValueForPoint(
|
| - int channel, const PaintingData& paintingData,
|
| + int channel,
|
| StitchData& stitchData, const SkPoint& point) const;
|
| - SkScalar noise2D(int channel, const PaintingData& paintingData,
|
| + SkScalar noise2D(int channel,
|
| const StitchData& stitchData, const SkPoint& noiseVector) const;
|
|
|
| SkMatrix fMatrix;
|
| + PaintingData* fPaintingData;
|
|
|
| typedef SkShader::Context INHERITED;
|
| };
|
| @@ -123,8 +124,6 @@ private:
|
| /*const*/ SkISize fTileSize;
|
| /*const*/ bool fStitchTiles;
|
|
|
| - PaintingData* fPaintingData;
|
| -
|
| typedef SkShader INHERITED;
|
| };
|
|
|
|
|