| Index: Source/platform/fonts/SimpleFontData.h
|
| diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
|
| index 940fd9bdd5b9d5a2871c58a88d03f702d9403bb7..525a9bec7837b84eacd57494848a2c919835e360 100644
|
| --- a/Source/platform/fonts/SimpleFontData.h
|
| +++ b/Source/platform/fonts/SimpleFontData.h
|
| @@ -124,7 +124,7 @@ public:
|
| Glyph zeroGlyph() const { return m_zeroGlyph; }
|
| void setZeroGlyph(Glyph zeroGlyph) { m_zeroGlyph = zeroGlyph; }
|
|
|
| - virtual const SimpleFontData* fontDataForCharacter(UChar32) const OVERRIDE;
|
| + virtual const SimpleFontData* fontDataForCharacter(UChar32) const override;
|
|
|
| Glyph glyphForCharacter(UChar32) const;
|
|
|
| @@ -132,11 +132,11 @@ public:
|
| Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
|
|
|
| bool isSVGFont() const { return m_customFontData && m_customFontData->isSVGFont(); }
|
| - virtual bool isCustomFont() const OVERRIDE { return m_customFontData; }
|
| - virtual bool isLoading() const OVERRIDE { return m_customFontData ? m_customFontData->isLoading() : false; }
|
| - virtual bool isLoadingFallback() const OVERRIDE { return m_customFontData ? m_customFontData->isLoadingFallback() : false; }
|
| - virtual bool isSegmented() const OVERRIDE;
|
| - virtual bool shouldSkipDrawing() const OVERRIDE { return m_customFontData && m_customFontData->shouldSkipDrawing(); }
|
| + virtual bool isCustomFont() const override { return m_customFontData; }
|
| + virtual bool isLoading() const override { return m_customFontData ? m_customFontData->isLoading() : false; }
|
| + virtual bool isLoadingFallback() const override { return m_customFontData ? m_customFontData->isLoadingFallback() : false; }
|
| + virtual bool isSegmented() const override;
|
| + virtual bool shouldSkipDrawing() const override { return m_customFontData && m_customFontData->shouldSkipDrawing(); }
|
|
|
| const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
|
| void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; }
|
|
|