| Index: src/gpu/effects/GrTextureDomainEffect.cpp
|
| diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
|
| index dcfda287ff48fd907bbb8bf6d7ba44b0e97e166a..96372d926f6bd7eb7771e4b654ac948f3506584f 100644
|
| --- a/src/gpu/effects/GrTextureDomainEffect.cpp
|
| +++ b/src/gpu/effects/GrTextureDomainEffect.cpp
|
| @@ -108,7 +108,7 @@ void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder,
|
| void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman,
|
| const GrDrawEffect& drawEffect) {
|
| const GrTextureDomainEffect& texDom = drawEffect.castEffect<GrTextureDomainEffect>();
|
| - const GrRect& domain = texDom.domain();
|
| + const SkRect& domain = texDom.domain();
|
|
|
| float values[4] = {
|
| SkScalarToFloat(domain.left()),
|
| @@ -151,7 +151,7 @@ GrGLEffect::EffectKey GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEf
|
|
|
| GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| - const GrRect& domain,
|
| + const SkRect& domain,
|
| WrapMode wrapMode,
|
| bool bilerp,
|
| CoordsType coordsType) {
|
| @@ -185,7 +185,7 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture,
|
|
|
| GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture,
|
| const SkMatrix& matrix,
|
| - const GrRect& domain,
|
| + const SkRect& domain,
|
| WrapMode wrapMode,
|
| bool bilerp,
|
| CoordsType coordsType)
|
| @@ -226,7 +226,7 @@ GrEffectRef* GrTextureDomainEffect::TestCreate(SkMWCRandom* random,
|
| GrTexture* textures[]) {
|
| int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx :
|
| GrEffectUnitTest::kAlphaTextureIdx;
|
| - GrRect domain;
|
| + SkRect domain;
|
| domain.fLeft = random->nextUScalar1();
|
| domain.fRight = random->nextRangeScalar(domain.fLeft, SK_Scalar1);
|
| domain.fTop = random->nextUScalar1();
|
|
|