Revert of Fix mixed samples stencil clip

src/gpu/GrPipeline.h

Index: src/gpu/GrPipeline.h
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 772fc452d73e52905edbab5a08986d2ed98f5b17..8781058247fe438300ac2f5cb919c389aea31c1b 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -20,7 +20,6 @@
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 
-class GrAppliedClip;
 class GrBatch;
 class GrDeviceCoordTexture;
 class GrPipelineBuilder;
@@ -39,7 +38,7 @@
         const GrCaps*               fCaps;
         GrProcOptInfo               fColorPOI;
         GrProcOptInfo               fCoveragePOI;
-        const GrAppliedClip*        fClip;
+        const GrScissorState*       fScissor;
         GrXferProcessor::DstTexture fDstTexture;
     };
 
@@ -126,7 +125,6 @@
 
     bool isHWAntialiasState() const { return SkToBool(fFlags & kHWAA_Flag); }
     bool snapVerticesToPixelCenters() const { return SkToBool(fFlags & kSnapVertices_Flag); }
-    bool hasCoCenteredSamples() const { return SkToBool(fFlags & kCoCenteredSamples_Flag); }
 
     GrXferBarrierType xferBarrierType(const GrCaps& caps) const {
         return fXferProcessor->xferBarrierType(fRenderTarget.get(), caps);
@@ -168,7 +166,6 @@
     enum Flags {
         kHWAA_Flag              = 0x1,
         kSnapVertices_Flag      = 0x2,
-        kCoCenteredSamples_Flag = 0x4
     };
 
     typedef GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> RenderTarget;