From 8059eb9f6e24ed609393fbda4ad71edea03ac258 Mon Sep 17 00:00:00 2001
From: joshualitt <joshualitt@chromium.org>
Date: Mon, 29 Dec 2014 15:10:07 -0800
Subject: Move ViewMatrix off of drawstate

BUG=skia:

Review URL: https://codereview.chromium.org/815553003
---
 src/gpu/GrBitmapTextContext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gpu/GrBitmapTextContext.cpp')

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 94b2770b23..fdf96002bd 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -528,7 +528,7 @@ void GrBitmapTextContext::flush() {
 
     if (fCurrVertex > 0) {
         GrDrawState drawState;
-        drawState.setFromPaint(fPaint, SkMatrix::I(), fContext->getRenderTarget());
+        drawState.setFromPaint(fPaint, fContext->getRenderTarget());
 
         // setup our sampler state for our text texture/atlas
         SkASSERT(SkIsAlign4(fCurrVertex));
@@ -566,7 +566,7 @@ void GrBitmapTextContext::flush() {
             if (textureUniqueID != fEffectTextureUniqueID ||
                 fCachedGeometryProcessor->color() != color) {
                 uint32_t flags = GrDefaultGeoProcFactory::kLocalCoord_GPType;
-                fCachedGeometryProcessor.reset(GrDefaultGeoProcFactory::Create(color, flags));
+                fCachedGeometryProcessor.reset(GrDefaultGeoProcFactory::Create(flags, color));
                 fCachedTextureProcessor.reset(GrSimpleTextureEffect::Create(fCurrTexture,
                                                                             SkMatrix::I(),
                                                                             params));
-- 
cgit v1.2.3