commit 9853ccef19c200be93a6211f32589fa82a53067c
author joshualitt <joshualitt@chromium.org> Mon Nov 17 14:22:48 2014 -0800
committer Commit bot <commit-bot@chromium.org> Mon Nov 17 14:22:49 2014 -0800
tree fd07ff890581f7df7b99021e5bc42f75539c6050
parent b079ec682d6f049e5f0df83efa41a1eaa50215c6

Drawstate on stack

BUG=skia:

Review URL: https://codereview.chromium.org/732693002

src/gpu/GrStencilAndCoverTextContext.cpp

diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp
index 14a14a0..d70593e 100644
--- a/src/gpu/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/GrStencilAndCoverTextContext.cpp
@@ -333,10 +333,9 @@
                                     &fGlyphCache->getDescriptor(), gpuStroke);
     }
 
-    fStateRestore.set(fDrawTarget->drawState());
+    fStateRestore.set(&fDrawState);
 
-    fDrawTarget->drawState()->setFromPaint(fPaint, fContext->getMatrix(),
-                                           fContext->getRenderTarget());
+    fDrawState.setFromPaint(fPaint, fContext->getMatrix(), fContext->getRenderTarget());
 
     GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
                                  kZero_StencilOp,
@@ -346,7 +345,7 @@
                                  0x0000,
                                  0xffff);
 
-    *fDrawTarget->drawState()->stencil() = kStencilPass;
+    *fDrawState.stencil() = kStencilPass;
 
     SkASSERT(0 == fPendingGlyphCount);
 }
@@ -368,7 +367,7 @@
         return;
     }
 
-    fDrawTarget->drawPaths(fGlyphs, fIndexBuffer, fPendingGlyphCount, fTransformBuffer,
+    fDrawTarget->drawPaths(&fDrawState, fGlyphs, fIndexBuffer, fPendingGlyphCount, fTransformBuffer,
                            GrPathRendering::kTranslate_PathTransformType,
                            GrPathRendering::kWinding_FillType);
 
@@ -384,7 +383,7 @@
     SkGlyphCache::AttachCache(fGlyphCache);
     fGlyphCache = NULL;
 
-    fDrawTarget->drawState()->stencil()->setDisabled();
+    fDrawState.stencil()->setDisabled();
     fStateRestore.set(NULL);
     fContext->setMatrix(fContextInitialMatrix);
     GrTextContext::finish();