Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: Source/platform/fonts/SimpleFontData.h

Issue 1213003004: Fix virtual/override/final usage in Source/platform/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/SegmentedFontData.h ('k') | Source/platform/geometry/FloatPolygon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/SimpleFontData.h
diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
index b107156988c723d039865b7630fad009178a7f7f..f9ed029da07e4ebdc55d45125b862ae967696050 100644
--- a/Source/platform/fonts/SimpleFontData.h
+++ b/Source/platform/fonts/SimpleFontData.h
@@ -57,7 +57,7 @@ public:
return adoptRef(new SimpleFontData(platformData, customData, isTextOrientationFallback));
}
- virtual ~SimpleFontData();
+ ~SimpleFontData() override;
const FontPlatformData& platformData() const { return m_platformData; }
const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
@@ -112,15 +112,15 @@ public:
Glyph zeroGlyph() const { return m_zeroGlyph; }
void setZeroGlyph(Glyph zeroGlyph) { m_zeroGlyph = zeroGlyph; }
- virtual const SimpleFontData* fontDataForCharacter(UChar32) const override;
+ const SimpleFontData* fontDataForCharacter(UChar32) const override;
Glyph glyphForCharacter(UChar32) const;
- 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(); }
+ bool isCustomFont() const override { return m_customFontData; }
+ bool isLoading() const override { return m_customFontData ? m_customFontData->isLoading() : false; }
+ bool isLoadingFallback() const override { return m_customFontData ? m_customFontData->isLoadingFallback() : false; }
+ bool isSegmented() const override;
+ 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; }
« no previous file with comments | « Source/platform/fonts/SegmentedFontData.h ('k') | Source/platform/geometry/FloatPolygon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698