Stop creating GrODS for stencilPath commands.

src/gpu/GrOptDrawState.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrOptDrawState.h"
 
 #include "GrDrawState.h"
 #include "GrDrawTargetCaps.h"
 #include "GrGpu.h"
 #include "GrProcOptInfo.h"
 #include "GrXferProcessor.h"
 
 GrOptDrawState::GrOptDrawState(const GrDrawState& drawState,
                                const GrGeometryProcessor* gp,
                                const GrPathProcessor* pathProc,
                                const GrDrawTargetCaps& caps,
-                               const ScissorState& scissorState,
+                               const GrScissorState& scissorState,
                                const GrDeviceCoordTexture* dstCopy,
                                GrGpu::DrawType drawType)
     : fFinalized(false) {
     fDrawType = drawType;
 
     // Copy GeometryProcesssor from DS or ODS
     if (gp) {
         SkASSERT(!pathProc);
-        SkASSERT(!(GrGpu::IsPathRenderingDrawType(drawType) ||
-                   GrGpu::kStencilPath_DrawType == drawType));
+        SkASSERT(!GrGpu::IsPathRenderingDrawType(drawType));
         fGeometryProcessor.reset(gp);
         fPrimitiveProcessor.reset(gp);
     } else {
-        SkASSERT(!gp && pathProc && (GrGpu::IsPathRenderingDrawType(drawType) ||
-                 GrGpu::kStencilPath_DrawType == drawType));
+        SkASSERT(!gp && pathProc && GrGpu::IsPathRenderingDrawType(drawType));
         fPrimitiveProcessor.reset(pathProc);
     }
 
 
     const GrProcOptInfo& colorPOI = drawState.colorProcInfo(fPrimitiveProcessor);
     const GrProcOptInfo& coveragePOI = drawState.coverageProcInfo(fPrimitiveProcessor);
 
     // Create XferProcessor from DS's XPFactory
     SkAutoTUnref<GrXferProcessor> xferProcessor(
         drawState.getXPFactory()->createXferProcessor(colorPOI, coveragePOI));
@@ skipping 12 matching lines @@
                                                    drawState.isCoverageDrawing(),
                                                    drawState.isColorWriteDisabled(),
                                                    drawState.getStencil().doesWrite(),
                                                    &overrideColor,
                                                    caps);
     }
 
     // When path rendering the stencil settings are not always set on the draw state
     // so we must check the draw type. In cases where we will skip drawing we simply return a
     // null GrOptDrawState.
-    if (!xferProcessor || ((GrXferProcessor::kSkipDraw_OptFlag & optFlags) &&
-                           GrGpu::kStencilPath_DrawType != drawType)) {
+    if (!xferProcessor || (GrXferProcessor::kSkipDraw_OptFlag & optFlags)) {
         // Set the fields that don't default init and return. The lack of a render target will
         // indicate that this can be skipped.
         fFlags = 0;
         fDrawFace = GrDrawState::kInvalid_DrawFace;
         fViewMatrix.reset();
         return;
     }
 
     fRenderTarget.reset(drawState.fRenderTarget.get());
     SkASSERT(fRenderTarget);
@@ skipping 127 matching lines @@
         if (this->getFragmentStage(i) != that.getFragmentStage(i)) {
             return false;
         }
     }
 
     // Now update the GrPrimitiveProcessor's batch tracker
     fPrimitiveProcessor->makeEqual(&fBatchTracker, that.getBatchTracker());
     return true;
 }