commit 309e346744f57fadd66ba3c2f14875c86311682e
author egdaniel <egdaniel@google.com> Tue Dec 09 10:35:58 2014 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 09 10:35:58 2014 -0800
tree d2e60d89ba4664683f4c10603280441c866e6143
parent e451c4df7369c5e253ef9c9e0a8713beda25f34b

Rename CustomCoordTextureEffect to GrBitmapTextGeoProc.

Also add in explicit set for LCD text in invariantOutput.

BUG=skia:

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

src/gpu/GrBitmapTextContext.cpp

diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index 48054f4..9816af9 100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -27,7 +27,7 @@
 #include "SkStrokeRec.h"
 #include "SkTextMapStateProc.h"
 
-#include "effects/GrCustomCoordsTextureEffect.h"
+#include "effects/GrBitmapTextGeoProc.h"
 #include "effects/GrSimpleTextureEffect.h"
 
 SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
@@ -547,10 +547,10 @@
         } else {
             uint32_t textureUniqueID = fCurrTexture->getUniqueID();
             if (textureUniqueID != fEffectTextureUniqueID) {
-                bool hasColor = kA8_GrMaskFormat == fCurrMaskFormat;
-                fCachedGeometryProcessor.reset(GrCustomCoordsTextureEffect::Create(fCurrTexture,
-                                                                                   params,
-                                                                                   hasColor));
+                bool useColorAttrib = kA8_GrMaskFormat == fCurrMaskFormat;
+                fCachedGeometryProcessor.reset(GrBitmapTextGeoProc::Create(fCurrTexture,
+                                                                           params,
+                                                                           useColorAttrib));
                 fEffectTextureUniqueID = textureUniqueID;
             }
             drawState.setGeometryProcessor(fCachedGeometryProcessor.get());