Revert of Remove GP from drawstate, revision of invariant output for GP

src/gpu/GrDefaultGeoProcFactory.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 "GrDefaultGeoProcFactory.h"
 
 #include "GrDrawState.h"
@@ skipping 110 matching lines @@
                                                              kFloat_GrVertexAttribType));
             this->setHasVertexCoverage();
         }
     }
 
     virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE {
         const DefaultGeoProc& gp = other.cast<DefaultGeoProc>();
         return gp.fFlags == this->fFlags;
     }
 
-    virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE {
+    virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
         if (fInCoverage) {
-            out->setUnknownSingleComponent();
+            inout->mulByUnknownAlpha();
         } else {
-            // uniform coverage
-            out->setKnownSingleComponent(this->coverage());
+            inout->mulByKnownAlpha(255);
         }
     }
 
     const GrAttribute* fInPosition;
     const GrAttribute* fInColor;
     const GrAttribute* fInLocalCoords;
     const GrAttribute* fInCoverage;
     uint32_t fFlags;
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
@@ skipping 18 matching lines @@
         flags |= GrDefaultGeoProcFactory::kLocalCoord_GPType;
     }
 
     return DefaultGeoProc::Create(GrRandomColor(random), GrRandomCoverage(random), flags);
 }
 
 const GrGeometryProcessor* GrDefaultGeoProcFactory::Create(GrColor color, uint32_t gpTypeFlags,
                                                            uint8_t coverage) {
     return DefaultGeoProc::Create(color, coverage, gpTypeFlags);
 }