Add XP to handle the cases where we disable color write.

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"
@@ skipping 35 matching lines @@
     if (colorPOI.firstEffectiveStageIndex() != 0) {
         overrideColor = colorPOI.inputColorToEffectiveStage();
     }
 
     GrXferProcessor::OptFlags optFlags;
     if (xferProcessor) {
         fXferProcessor.reset(xferProcessor.get());
 
         optFlags = xferProcessor->getOptimizations(colorPOI,
                                                    coveragePOI,
-                                                   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)) {
         // Set the fields that don't default init and return. The lack of a render target will
@@ skipping 12 matching lines @@
     fDrawFace = drawState.getDrawFace();
     // TODO move this out of optDrawState
     if (dstCopy) {
         fDstCopy = *dstCopy;
     }
 
     fFlags = 0;
     if (drawState.isHWAntialias()) {
         fFlags |= kHWAA_Flag;
     }
-    if (drawState.isColorWriteDisabled()) {
-        fFlags |= kDisableColorWrite_Flag;
-    }
     if (drawState.isDither()) {
         fFlags |= kDither_Flag;
     }
 
     // TODO move local coords completely into GP
     bool hasLocalCoords = gp && gp->hasLocalCoords();
 
     int firstColorStageIdx = colorPOI.firstEffectiveStageIndex();
 
     // TODO: Once we can handle single or four channel input into coverage stages then we can use
@@ skipping 101 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;
 }