I'd really like to land this before the branch so speedy reviews are appreciated.

BUG=skia:

Review URL: https://codereview.chromium.org/936943002

1 files changed, 4 insertions, 3 deletions

diff --git a/gm/texdata.cpp b/gm/texdata.cpp
index e0aa233196..927bea5db6 100644
--- a/gm/texdata.cpp
+++ b/gm/texdata.cpp
@@ -91,7 +91,8 @@ protected:
                 }
                 SkAutoTUnref<GrTexture> au(texture);
 
-                GrContext::AutoClip acs(ctx, SkRect::MakeWH(2*S, 2*S));
+                // setup new clip
+                GrClip clip(SkRect::MakeWH(2*S, 2*S));
 
                 GrPaint paint;
                 paint.setPorterDuffXPFactory(SkXfermode::kSrcOver_Mode);
@@ -109,7 +110,7 @@ protected:
                 tm.postIDiv(2*S, 2*S);
                 paint.addColorTextureProcessor(texture, tm);
 
-                ctx->drawRect(target, paint, vm, SkRect::MakeWH(2*S, 2*S));
+                ctx->drawRect(target, clip, paint, vm, SkRect::MakeWH(2*S, 2*S));
 
                 // now update the lower right of the texture in first pass
                 // or upper right in second pass
@@ -123,7 +124,7 @@ protected:
                 texture->writePixels(S, (i ? 0 : S), S, S,
                                      texture->config(), gTextureData.get(),
                                      4 * stride);
-                ctx->drawRect(target, paint, vm, SkRect::MakeWH(2*S, 2*S));
+                ctx->drawRect(target, clip, paint, vm, SkRect::MakeWH(2*S, 2*S));
             }
         } else {
             this->drawGpuOnlyMessage(canvas);