Index: src/gpu/GrStencilAndCoverTextContext.cpp |
diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp |
index 6447ca523a049efb55b689e74337fd93b183fb50..c29dca6d0af540e5151865abfa3ca7e29adec2b4 100644 |
--- a/src/gpu/GrStencilAndCoverTextContext.cpp |
+++ b/src/gpu/GrStencilAndCoverTextContext.cpp |
@@ -344,9 +344,9 @@ void GrStencilAndCoverTextContext::init(const GrPaint& paint, |
&fGlyphCache->getDescriptor(), fStroke); |
} |
- fStateRestore.set(&fDrawState); |
+ fStateRestore.set(&fPipelineBuilder); |
- fDrawState.setFromPaint(fPaint, fContext->getRenderTarget()); |
+ fPipelineBuilder.setFromPaint(fPaint, fContext->getRenderTarget()); |
GR_STATIC_CONST_SAME_STENCIL(kStencilPass, |
kZero_StencilOp, |
@@ -356,7 +356,7 @@ void GrStencilAndCoverTextContext::init(const GrPaint& paint, |
0x0000, |
0xffff); |
- *fDrawState.stencil() = kStencilPass; |
+ *fPipelineBuilder.stencil() = kStencilPass; |
SkASSERT(0 == fQueuedGlyphCount); |
SkASSERT(kGlyphBufferSize == fFallbackGlyphsIdx); |
@@ -408,7 +408,7 @@ void GrStencilAndCoverTextContext::flush() { |
SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(fPaint.getColor(), |
fViewMatrix, |
fLocalMatrix)); |
- fDrawTarget->drawPaths(&fDrawState, pp, fGlyphs, |
+ fDrawTarget->drawPaths(&fPipelineBuilder, pp, fGlyphs, |
fGlyphIndices, GrPathRange::kU16_PathIndexType, |
get_xy_scalar_array(fGlyphPositions), |
GrPathRendering::kTranslate_PathTransformType, |
@@ -453,7 +453,7 @@ void GrStencilAndCoverTextContext::finish() { |
SkGlyphCache::AttachCache(fGlyphCache); |
fGlyphCache = NULL; |
- fDrawState.stencil()->setDisabled(); |
+ fPipelineBuilder.stencil()->setDisabled(); |
fStateRestore.set(NULL); |
fViewMatrix = fContextInitialMatrix; |
GrTextContext::finish(); |