| Index: src/fonts/SkGScalerContext.cpp
|
| diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp
|
| index cd5db5f9f8f67b12304644380bc50829feb6e60b..17eee82a134ae04979915fb83ea02f19fe1a08b0 100644
|
| --- a/src/fonts/SkGScalerContext.cpp
|
| +++ b/src/fonts/SkGScalerContext.cpp
|
| @@ -16,13 +16,13 @@ public:
|
| virtual ~SkGScalerContext();
|
|
|
| protected:
|
| - unsigned generateGlyphCount() SK_OVERRIDE;
|
| - uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE;
|
| - void generateAdvance(SkGlyph*) SK_OVERRIDE;
|
| - void generateMetrics(SkGlyph*) SK_OVERRIDE;
|
| - void generateImage(const SkGlyph&) SK_OVERRIDE;
|
| - void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE;
|
| - void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE;
|
| + unsigned generateGlyphCount() override;
|
| + uint16_t generateCharToGlyph(SkUnichar) override;
|
| + void generateAdvance(SkGlyph*) override;
|
| + void generateMetrics(SkGlyph*) override;
|
| + void generateImage(const SkGlyph&) override;
|
| + void generatePath(const SkGlyph&, SkPath*) override;
|
| + void generateFontMetrics(SkPaint::FontMetrics*) override;
|
|
|
| private:
|
| SkGTypeface* fFace;
|
|
|