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

src/gpu/GrStencilAndCoverTextContext.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 "GrStencilAndCoverTextContext.h"
 #include "GrBitmapTextContext.h"
 #include "GrDrawTarget.h"
@@ skipping 381 matching lines @@
 
 static const SkScalar* get_xy_scalar_array(const SkPoint* pointArray) {
     GR_STATIC_ASSERT(2 * sizeof(SkScalar) == sizeof(SkPoint));
     GR_STATIC_ASSERT(0 == offsetof(SkPoint, fX));
 
     return &pointArray[0].fX;
 }
 
 void GrStencilAndCoverTextContext::flush() {
     if (fQueuedGlyphCount > 0) {
-        SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(fPaint.getColor()));
-        fDrawTarget->drawPaths(&fDrawState, pp, fGlyphs,
+        fDrawTarget->drawPaths(&fDrawState, fPaint.getColor(), fGlyphs,
                                fGlyphIndices, GrPathRange::kU16_PathIndexType,
                                get_xy_scalar_array(fGlyphPositions),
                                GrPathRendering::kTranslate_PathTransformType,
                                fQueuedGlyphCount, GrPathRendering::kWinding_FillType);
 
         fQueuedGlyphCount = 0;
     }
 
     if (fFallbackGlyphsIdx < kGlyphBufferSize) {
         int fallbackGlyphCount = kGlyphBufferSize - fFallbackGlyphsIdx;
@@ skipping 32 matching lines @@
 
     SkGlyphCache::AttachCache(fGlyphCache);
     fGlyphCache = NULL;
 
     fDrawState.stencil()->setDisabled();
     fStateRestore.set(NULL);
     fContext->setMatrix(fContextInitialMatrix);
     GrTextContext::finish();
 }