clear stencil clip on draw target

src/gpu/gl/GrGpuGL.h

Index: src/gpu/gl/GrGpuGL.h
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 46d970069bf675cb53103c28d9600056ac4160f8..568ce96f3109164d058c82ba4f631fdd84d2f164 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -135,6 +135,10 @@ private:
     virtual void onClear(GrRenderTarget*, const SkIRect* rect, GrColor color,
                          bool canIgnoreRect) SK_OVERRIDE;
 
+    virtual void onClearStencilClip(GrRenderTarget*,
+                                    const SkIRect& rect,
+                                    bool insideClip) SK_OVERRIDE;
+
     virtual bool onReadPixels(GrRenderTarget* target,
                               int left, int top,
                               int width, int height,
@@ -153,10 +157,8 @@ private:
 
 
     virtual void clearStencil(GrRenderTarget*) SK_OVERRIDE;
-    virtual void clearStencilClip(GrRenderTarget*, const SkIRect& rect,
-                                  bool insideClip) SK_OVERRIDE;
     virtual bool flushGraphicsState(DrawType,
-                                    const ScissorState&,
+                                    const GrClipMaskManager::ScissorState&,
                                     const GrDeviceCoordTexture* dstCopy) SK_OVERRIDE;
 
     // GrDrawTarget overrides
@@ -227,7 +229,7 @@ private:
 
     // flushes the scissor. see the note on flushBoundTextureAndParams about
     // flushing the scissor after that function is called.
-    void flushScissor(const ScissorState&,
+    void flushScissor(const GrClipMaskManager::ScissorState&,
                       const GrGLIRect& rtViewport,
                       GrSurfaceOrigin rtOrigin);