Rename CustomCoordTextureEffect to GrBitmapTextGeoProc.

include/gpu/GrInvariantOutput.h

Index: include/gpu/GrInvariantOutput.h
diff --git a/include/gpu/GrInvariantOutput.h b/include/gpu/GrInvariantOutput.h
index 4f61999dcda72fd0e56db7589b784888cd35c74a..1233abc1058220484e8c5ac486f01d4c74b31f98 100644
--- a/include/gpu/GrInvariantOutput.h
+++ b/include/gpu/GrInvariantOutput.h
@@ -14,7 +14,7 @@ class GrInvariantOutput {
 public:
     GrInvariantOutput(GrColor color, GrColorComponentFlags flags, bool isSingleComponent)
         : fColor(color), fValidFlags(flags), fIsSingleComponent(isSingleComponent),
-          fNonMulStageFound(false), fWillUseInputColor(true) {}
+          fNonMulStageFound(false), fWillUseInputColor(true), fIsLCDText(false) {}
 
     virtual ~GrInvariantOutput() {}
 
@@ -92,6 +92,12 @@ public:
         }
     }
 
+    // Temporary setter to handle LCD text correctly until we improve texture pixel config queries

[bsalomon, 2014/12/09 18:01:45]

Can we call it setUsingLCDCoverage?

+    // and thus can rely solely on number of coverage components for RGA vs single channel coverage.
+    void setUsingLCDText() {
+        fIsLCDText = true;
+    }
+
     GrColor color() const { return fColor; }
     uint8_t validFlags() const { return fValidFlags; }
 
@@ -101,13 +107,6 @@ public:
      */
     SkDEBUGCODE(void validate() const;)
 
-protected:
-    GrColor fColor;
-    uint32_t fValidFlags;
-    bool fIsSingleComponent;
-    bool fNonMulStageFound;
-    bool fWillUseInputColor;
-
 private:
     friend class GrProcOptInfo;
 
@@ -149,11 +148,21 @@ private:
 
     void resetNonMulStageFound() { fNonMulStageFound = false; }
 
+    bool isLCDText() const { return fIsLCDText; }

[bsalomon, 2014/12/09 18:01:45]

isLCDCoverage?

+
     SkDEBUGCODE(bool colorComponentsAllEqual() const;)
     /**
      * If alpha is valid, check that any valid R,G,B values are <= A
      */
     SkDEBUGCODE(bool validPreMulColor() const;)
+
+    GrColor fColor;
+    uint32_t fValidFlags;
+    bool fIsSingleComponent;
+    bool fNonMulStageFound;
+    bool fWillUseInputColor;
+    bool fIsLCDText; // Temorary data member until texture pixel configs are updated
+
 };
 
 #endif