Merge GrClipMaskManager into GrClipStackClip

src/gpu/GrSWMaskHelper.h

Index: src/gpu/GrSWMaskHelper.h
diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/GrSWMaskHelper.h
index 6d1d9b1d46c6e9db8570e1567e70c6bffad3ebc4..f2bb34b30c090df98c8c365ceae0e472b96a945b 100644
--- a/src/gpu/GrSWMaskHelper.h
+++ b/src/gpu/GrSWMaskHelper.h
@@ -75,7 +75,7 @@ public:
                                              const SkMatrix* matrix);
 
     // This utility routine is used to add a shape's mask to some other draw.
-    // The ClipMaskManager uses it to accumulate clip masks while the
+    // The GrClipStackClip uses it to accumulate clip masks while the
     // GrSoftwarePathRenderer uses it to fulfill a drawPath call.
     // It draws with "texture" as a path mask into "target" using "rect" as
     // geometry and the current drawState. The current drawState is altered to