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

Side by Side Diff: Source/platform/fonts/SimpleFontData.h

Issue 131003004: Update platform classes to use OVERRIDE / FINAL when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/SegmentedFontData.h ('k') | Source/platform/graphics/BitmapImage.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of the internal font implementation. 2 * This file is part of the internal font implementation.
3 * 3 *
4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2007-2008 Torch Mobile, Inc. 5 * Copyright (C) 2007-2008 Torch Mobile, Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool isSVGFont() const { return m_customFontData && m_customFontData->isSVGF ont(); } 146 bool isSVGFont() const { return m_customFontData && m_customFontData->isSVGF ont(); }
147 virtual bool isCustomFont() const OVERRIDE { return m_customFontData; } 147 virtual bool isCustomFont() const OVERRIDE { return m_customFontData; }
148 virtual bool isLoading() const OVERRIDE { return m_customFontData ? m_custom FontData->isLoading() : false; } 148 virtual bool isLoading() const OVERRIDE { return m_customFontData ? m_custom FontData->isLoading() : false; }
149 virtual bool isLoadingFallback() const OVERRIDE { return m_customFontData ? m_customFontData->isLoadingFallback() : false; } 149 virtual bool isLoadingFallback() const OVERRIDE { return m_customFontData ? m_customFontData->isLoadingFallback() : false; }
150 virtual bool isSegmented() const OVERRIDE; 150 virtual bool isSegmented() const OVERRIDE;
151 151
152 const GlyphData& missingGlyphData() const { return m_missingGlyphData; } 152 const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
153 void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; } 153 void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; }
154 154
155 #ifndef NDEBUG 155 #ifndef NDEBUG
156 virtual String description() const; 156 virtual String description() const OVERRIDE;
157 #endif 157 #endif
158 158
159 #if OS(MACOSX) 159 #if OS(MACOSX)
160 const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const; 160 const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
161 NSFont* getNSFont() const { return m_platformData.font(); } 161 NSFont* getNSFont() const { return m_platformData.font(); }
162 #endif 162 #endif
163 163
164 #if OS(MACOSX) 164 #if OS(MACOSX)
165 CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const; 165 CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
166 #endif 166 #endif
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 #endif 294 #endif
295 else 295 else
296 width = platformWidthForGlyph(glyph); 296 width = platformWidthForGlyph(glyph);
297 297
298 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); 298 m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
299 return width; 299 return width;
300 } 300 }
301 301
302 } // namespace WebCore 302 } // namespace WebCore
303 #endif // SimpleFontData_h 303 #endif // SimpleFontData_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/SegmentedFontData.h ('k') | Source/platform/graphics/BitmapImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698