Make GrAppliedClip friendless

src/gpu/GrClip.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrClip.h"
 
 #include "GrClipMaskManager.h"
@@ skipping 34 matching lines @@
     if (fScissorState.enabled()) {
         const GrRenderTarget* rt = pipelineBuilder.getRenderTarget();
         SkIRect tightScissor;
         if (!tightScissor.intersect(fScissorState.rect(),
                                     SkIRect::MakeWH(rt->width(), rt->height()))) {
             return false;
         }
         if (devBounds && !devBounds->intersects(SkRect::Make(tightScissor))) {
             return false;
         }
-        out->fScissorState.set(tightScissor);
+        out->makeScissoredStencil(fHasStencilClip, tightScissor);
+        return true;
     }
-    out->fHasStencilClip = fHasStencilClip;
+
+    out->makeStencil(fHasStencilClip);
     return true;
 }
 
 bool GrClipStackClip::quickContains(const SkRect& rect) const {
     if (!fStack) {
         return true;
     }
     return fStack->quickContains(rect.makeOffset(SkIntToScalar(fOrigin.x()),
                                                  SkIntToScalar(fOrigin.y())));
 }
@@ skipping 12 matching lines @@
                                   isIntersectionOfRects);
     devBounds.roundOut(devResult);
 }
 
 bool GrClipStackClip::apply(GrClipMaskManager* clipMaskManager,
                             const GrPipelineBuilder& pipelineBuilder, const SkRect* devBounds,
                             GrAppliedClip* out) const {
     // TODO: Collapse ClipMaskManager into this class.(?)
     return clipMaskManager->setupClipping(pipelineBuilder, *this, devBounds, out);
 }