Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: include/effects/SkPerlinNoiseShader.h

Issue 358903002: Make perlin noise do CTM-correct scaling. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix delete -> SkDELETE, add missing SkDELETE Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « expectations/gm/ignored-tests.txt ('k') | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698