Revert of Fix mixed samples stencil clip

src/gpu/GrPipeline.cpp

Index: src/gpu/GrPipeline.cpp
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 3662f6a180cd91fcb61ab2288f9a72ae7582ac90..073349be1ed900062964098d85773e416eedd75b 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -59,15 +59,12 @@
 
     pipeline->fRenderTarget.reset(builder.fRenderTarget.get());
     SkASSERT(pipeline->fRenderTarget);
-    pipeline->fScissorState = args.fClip->scissorState();
+    pipeline->fScissorState = *args.fScissor;
     pipeline->fStencilSettings = builder.getStencil();
     pipeline->fDrawFace = builder.getDrawFace();
 
     pipeline->fFlags = 0;
-    if (args.fClip->isCoCenteredMultisampledDraw()) {
-        SkASSERT(args.fCaps->programmableSampleLocationsSupport() && !builder.isHWAntialias());
-        pipeline->fFlags |= (kHWAA_Flag | kCoCenteredSamples_Flag);
-    } else if (builder.isHWAntialias()) {
+    if (builder.isHWAntialias()) {
         pipeline->fFlags |= kHWAA_Flag;
     }
     if (builder.snapVerticesToPixelCenters()) {