| Index: src/gpu/effects/GrTextureDomain.h
|
| diff --git a/src/gpu/effects/GrTextureDomain.h b/src/gpu/effects/GrTextureDomain.h
|
| index 7e270f821855457c841eb41e6459fa9cd8088e39..7796afe4c4c0db0e02ce5bd64c9ab7dc418b2ccf 100644
|
| --- a/src/gpu/effects/GrTextureDomain.h
|
| +++ b/src/gpu/effects/GrTextureDomain.h
|
| @@ -104,7 +104,7 @@ public:
|
| * Call this from GrGLEffect::setData() to upload uniforms necessary for the texture domain.
|
| * The rectangle is automatically adjusted to account for the texture's origin.
|
| */
|
| - void setData(const GrGLUniformManager& uman, const GrTextureDomain& textureDomain,
|
| + void setData(const GrGLProgramDataManager& pdman, const GrTextureDomain& textureDomain,
|
| GrSurfaceOrigin textureOrigin);
|
|
|
| enum {
|
| @@ -121,10 +121,10 @@ public:
|
| }
|
|
|
| private:
|
| - SkDEBUGCODE(Mode fMode;)
|
| - GrGLUniformManager::UniformHandle fDomainUni;
|
| - SkString fDomainName;
|
| - GrGLfloat fPrevDomain[4];
|
| + SkDEBUGCODE(Mode fMode;)
|
| + GrGLProgramDataManager::UniformHandle fDomainUni;
|
| + SkString fDomainName;
|
| + GrGLfloat fPrevDomain[4];
|
| };
|
|
|
| protected:
|
|
|