| Index: include/gpu/GrCoordTransform.h
|
| diff --git a/include/gpu/GrCoordTransform.h b/include/gpu/GrCoordTransform.h
|
| index 718bbe774f5f24ad7ef02c6a1119b1ef49dce8da..db71ff11584c701ccb6c52f7f8cfd95a8b035c90 100644
|
| --- a/include/gpu/GrCoordTransform.h
|
| +++ b/include/gpu/GrCoordTransform.h
|
| @@ -41,13 +41,13 @@ enum GrCoordSet {
|
| */
|
| class GrCoordTransform : SkNoncopyable {
|
| public:
|
| - GrCoordTransform() { SkDEBUGCODE(fInEffect = false); }
|
| + GrCoordTransform() { SkDEBUGCODE(fInProcessor = false); }
|
|
|
| /**
|
| * Create a transformation that maps [0, 1] to a texture's boundaries.
|
| */
|
| GrCoordTransform(GrCoordSet sourceCoords, const GrTexture* texture) {
|
| - SkDEBUGCODE(fInEffect = false);
|
| + SkDEBUGCODE(fInProcessor = false);
|
| this->reset(sourceCoords, texture);
|
| }
|
|
|
| @@ -57,25 +57,25 @@ public:
|
| * coord convention.
|
| */
|
| GrCoordTransform(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture = NULL) {
|
| - SkDEBUGCODE(fInEffect = false);
|
| + SkDEBUGCODE(fInProcessor = false);
|
| this->reset(sourceCoords, m, texture);
|
| }
|
|
|
| void reset(GrCoordSet sourceCoords, const GrTexture* texture) {
|
| - SkASSERT(!fInEffect);
|
| + SkASSERT(!fInProcessor);
|
| SkASSERT(texture);
|
| this->reset(sourceCoords, MakeDivByTextureWHMatrix(texture), texture);
|
| }
|
|
|
| void reset(GrCoordSet sourceCoords, const SkMatrix& m, const GrTexture* texture = NULL) {
|
| - SkASSERT(!fInEffect);
|
| + SkASSERT(!fInProcessor);
|
| fSourceCoords = sourceCoords;
|
| fMatrix = m;
|
| fReverseY = texture && kBottomLeft_GrSurfaceOrigin == texture->origin();
|
| }
|
|
|
| GrCoordTransform& operator= (const GrCoordTransform& other) {
|
| - SkASSERT(!fInEffect);
|
| + SkASSERT(!fInProcessor);
|
| fSourceCoords = other.fSourceCoords;
|
| fMatrix = other.fMatrix;
|
| fReverseY = other.fReverseY;
|
| @@ -87,7 +87,7 @@ public:
|
| * effect, since effects are immutable.
|
| */
|
| SkMatrix* accessMatrix() {
|
| - SkASSERT(!fInEffect);
|
| + SkASSERT(!fInProcessor);
|
| return &fMatrix;
|
| }
|
|
|
| @@ -119,9 +119,9 @@ private:
|
|
|
| #ifdef SK_DEBUG
|
| public:
|
| - void setInEffect() const { fInEffect = true; }
|
| + void setInProcessor() const { fInProcessor = true; }
|
| private:
|
| - mutable bool fInEffect;
|
| + mutable bool fInProcessor;
|
| #endif
|
| };
|
|
|
|
|