Fix for 510931, merge to m44

src/gpu/GrFontScaler.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrFontScaler_DEFINED
 #define GrFontScaler_DEFINED
 
 #include "GrGlyph.h"
 #include "GrTypes.h"
 
 #include "SkDescriptor.h"
 
+class SkGlyph;
 class SkPath;
 
 /*
  *  Wrapper class to turn a font cache descriptor into a key 
  *  for GrFontScaler-related lookups
  */
 class GrFontDescKey : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrFontDescKey)
     
@@ skipping 34 matching lines @@
  */
 class GrFontScaler : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrFontScaler)
 
     explicit GrFontScaler(SkGlyphCache* strike);
     virtual ~GrFontScaler();
     
     const GrFontDescKey* getKey();
     GrMaskFormat getMaskFormat() const;
-    GrMaskFormat getPackedGlyphMaskFormat(GrGlyph::PackedID) const;
-    bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds);
-    bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,
-                                     int rowBytes, void* image);
-    bool getPackedGlyphDFBounds(GrGlyph::PackedID, SkIRect* bounds);
-    bool getPackedGlyphDFImage(GrGlyph::PackedID, int width, int height,
-                                       void* image);
-    bool getGlyphPath(uint16_t glyphID, SkPath*);
+    GrMaskFormat getPackedGlyphMaskFormat(const SkGlyph&) const;
+    bool getPackedGlyphBounds(const SkGlyph&, SkIRect* bounds);
+    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&);
+    const SkGlyph& grToSkGlyph(GrGlyph::PackedID);
     
 private:
     SkGlyphCache*  fStrike;
     GrFontDescKey* fKey;
     
     typedef SkRefCnt INHERITED;
 };
 
 #endif