Fix for issue 1728: raster vs. gpu text draws with the wrong color

include/gpu/GrBitmapTextContext.h

Index: include/gpu/GrBitmapTextContext.h
diff --git a/include/gpu/GrBitmapTextContext.h b/include/gpu/GrBitmapTextContext.h
index 89672a84d5d13ac073fd72590d8421a18a86fc03..523263f8b263a8936a90397fb45ce6a032ab2723 100755
--- a/include/gpu/GrBitmapTextContext.h
+++ b/include/gpu/GrBitmapTextContext.h
@@ -17,7 +17,7 @@ class GrTextStrike;
  */
 class GrBitmapTextContext : public GrTextContext {
 public:
-    GrBitmapTextContext(GrContext*, const GrPaint&);
+    GrBitmapTextContext(GrContext*, const GrPaint&, GrColor);

[bsalomon, 2013/10/28 13:12:21]

Since everywhere else GrColor is a premul color, maybe we should pass as SkColor
and convert in the text context? I'm concerned about opening the door to non-PM
GrColors in public APIs as it could get confusing.

[jvanverth1, 2013/10/28 14:00:52]

Done.

     virtual ~GrBitmapTextContext();
 
     virtual void drawPackedGlyph(GrGlyph::PackedID, GrFixed left, GrFixed top,
@@ -36,6 +36,7 @@ private:
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
+    GrColor                 fPaintColorNoPreMultAlpha;
     SkPoint*                fVertices;
     int32_t                 fMaxVertices;
     GrTexture*              fCurrTexture;