clear stencil clip on draw target

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/683673002
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 2c3411d..743f191 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -214,7 +214,7 @@
                                       const SkRect* devBounds,
                                       GrDrawState::AutoRestoreEffects* are,
                                       GrDrawState::AutoRestoreStencil* ars,
-                                      GrDrawTarget::ScissorState* scissorState) {
+                                      ScissorState* scissorState) {
     fCurrClipMaskType = kNone_ClipMaskType;
 
     GrReducedClip::ElementList elements(16);
@@ -731,8 +731,9 @@
         SkASSERT((clipBit <= 16) && "Ganesh only handles 16b or smaller stencil buffers");
         clipBit = (1 << (clipBit-1));
 
-        fGpu->clearStencilClip(rt, stencilSpaceIBounds,
-                               GrReducedClip::kAllIn_InitialState == initialState);
+        fGpu->clearStencilClip(stencilSpaceIBounds,
+                               GrReducedClip::kAllIn_InitialState == initialState,
+                               rt);
 
         // walk through each clip element and perform its set op
         // with the existing clip.