Dont try to draw glyphs with unexpected mask formats

src/gpu/GrFontScaler.h

Index: src/gpu/GrFontScaler.h
diff --git a/src/gpu/GrFontScaler.h b/src/gpu/GrFontScaler.h
index 1dc5584c92fc614641dfcac988846116a4f8f97c..e42c7a1da007f866592b9970d0769bbe57759f86 100644
--- a/src/gpu/GrFontScaler.h
+++ b/src/gpu/GrFontScaler.h
@@ -52,7 +52,8 @@ public:
     GrMaskFormat getMaskFormat() const;
     GrMaskFormat getPackedGlyphMaskFormat(const SkGlyph&) const;
     bool getPackedGlyphBounds(const SkGlyph&, SkIRect* bounds);
-    bool getPackedGlyphImage(const SkGlyph&, int width, int height, int rowBytes, void* image);
+    bool getPackedGlyphImage(const SkGlyph&, int width, int height, int rowBytes,
+                             GrMaskFormat expectedMaskFormat, void* image);
     bool getPackedGlyphDFBounds(const SkGlyph&, SkIRect* bounds);
     bool getPackedGlyphDFImage(const SkGlyph&, int width, int height, void* image);
     const SkPath* getGlyphPath(const SkGlyph&);