Index: src/gpu/GrTextContext.cpp |
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp |
index 0c9e149f750988cf3dd7e4478362b32a78368844..bc116714dad02b1d2a5393518bc9bd918cb5e451 100644 |
--- a/src/gpu/GrTextContext.cpp |
+++ b/src/gpu/GrTextContext.cpp |
@@ -12,24 +12,27 @@ |
#include "SkGlyphCache.h" |
#include "SkGr.h" |
-GrTextContext::GrTextContext(GrContext* context, const GrPaint& paint, |
- const SkPaint& skPaint, const SkDeviceProperties& properties) : |
- fContext(context), fPaint(paint), fSkPaint(skPaint), |
- fDeviceProperties(properties) { |
+GrTextContext::GrTextContext(GrContext* context, const SkDeviceProperties& properties) : |
+ fContext(context), fDeviceProperties(properties), fDrawTarget(NULL) { |
+} |
- const GrClipData* clipData = context->getClip(); |
+void GrTextContext::init(const GrPaint& grPaint, const SkPaint& skPaint) { |
+ const GrClipData* clipData = fContext->getClip(); |
SkRect devConservativeBound; |
clipData->fClipStack->getConservativeBounds( |
-clipData->fOrigin.fX, |
-clipData->fOrigin.fY, |
- context->getRenderTarget()->width(), |
- context->getRenderTarget()->height(), |
+ fContext->getRenderTarget()->width(), |
+ fContext->getRenderTarget()->height(), |
&devConservativeBound); |
devConservativeBound.roundOut(&fClipRect); |
- fDrawTarget = context->getTextTarget(); |
+ fDrawTarget = fContext->getTextTarget(); |
+ |
+ fPaint = grPaint; |
+ fSkPaint = skPaint; |
} |
//*** change to output positions? |