Add XP to handle the cases where we disable color write.

src/gpu/GrClipMaskManager.cpp

Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 7f85801d998e882d00a13bac98bbbd0b1ee9395f..797a21a1a686b4a032b36acc6c2532e651144b6a 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -693,7 +693,8 @@ bool GrClipMaskManager::createStencilClipMask(GrRenderTarget* rt,
             GrDrawState drawState(matrix);
             drawState.setRenderTarget(rt);
             drawState.enableState(GrDrawState::kClip_StateBit);
-            drawState.enableState(GrDrawState::kNoColorWrites_StateBit);
+
+            drawState.setDisableColorXPFactory();
 
             // if the target is MSAA then we want MSAA enabled when the clip is soft
             if (rt->isMultisampled()) {