Rename CustomCoordTextureEffect to GrBitmapTextGeoProc.

include/gpu/GrInvariantOutput.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrInvariantOutput_DEFINED
 #define GrInvariantOutput_DEFINED
 
 #include "GrColor.h"
 
 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() {}
 
     enum ReadInput {
         kWill_ReadInput,
         kWillNot_ReadInput,
     };
 
     void mulByUnknownOpaqueColor() {
         if (this->isOpaque()) {
@@ skipping 57 matching lines @@
     }
 
     void setToUnknown(ReadInput readsInput) {
         this->internalSetToUnknown();
         fNonMulStageFound= true;
         if (kWillNot_ReadInput == readsInput) {
             fWillUseInputColor = false;
         }
     }
 
+    // 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; }
 
     /**
      * If isSingleComponent is true, then the flag values for r, g, b, and a must all be the
      * same. If the flags are all set then all color components must be equal.
      */
     SkDEBUGCODE(void validate() const;)
 
-protected:
-    GrColor fColor;
-    uint32_t fValidFlags;
-    bool fIsSingleComponent;
-    bool fNonMulStageFound;
-    bool fWillUseInputColor;
-
 private:
     friend class GrProcOptInfo;
 
     void reset(GrColor color, GrColorComponentFlags flags, bool isSingleComponent) {
         fColor = color;
         fValidFlags = flags;
         fIsSingleComponent = isSingleComponent;
         fNonMulStageFound = false;
         fWillUseInputColor = true;
     }
@@ skipping 21 matching lines @@
         return (fValidFlags == kRGBA_GrColorComponentFlags && 0xFFFFFFFF == fColor);
     }
 
     bool isSingleComponent() const { return fIsSingleComponent; }
 
     bool willUseInputColor() const { return fWillUseInputColor; }
     void resetWillUseInputColor() { fWillUseInputColor = true; }
 
     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