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

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

Issue 171823002: Make text visible when font loading takes longer than 3 seconds (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 9 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.cpp ('k') | no next file » | 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 Glyph glyphForCharacter(UChar32) const; 140 Glyph glyphForCharacter(UChar32) const;
141 141
142 void determinePitch(); 142 void determinePitch();
143 Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitc h; } 143 Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitc h; }
144 144
145 bool isSVGFont() const { return m_customFontData && m_customFontData->isSVGF ont(); } 145 bool isSVGFont() const { return m_customFontData && m_customFontData->isSVGF ont(); }
146 virtual bool isCustomFont() const OVERRIDE { return m_customFontData; } 146 virtual bool isCustomFont() const OVERRIDE { return m_customFontData; }
147 virtual bool isLoading() const OVERRIDE { return m_customFontData ? m_custom FontData->isLoading() : false; } 147 virtual bool isLoading() const OVERRIDE { return m_customFontData ? m_custom FontData->isLoading() : false; }
148 virtual bool isLoadingFallback() const OVERRIDE { return m_customFontData ? m_customFontData->isLoadingFallback() : false; } 148 virtual bool isLoadingFallback() const OVERRIDE { return m_customFontData ? m_customFontData->isLoadingFallback() : false; }
149 virtual bool isSegmented() const OVERRIDE; 149 virtual bool isSegmented() const OVERRIDE;
150 virtual bool shouldSkipDrawing() const OVERRIDE { return m_customFontData && m_customFontData->shouldSkipDrawing(); }
150 151
151 const GlyphData& missingGlyphData() const { return m_missingGlyphData; } 152 const GlyphData& missingGlyphData() const { return m_missingGlyphData; }
152 void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; } 153 void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; }
153 154
154 #ifndef NDEBUG 155 #ifndef NDEBUG
155 virtual String description() const OVERRIDE; 156 virtual String description() const OVERRIDE;
156 #endif 157 #endif
157 158
158 #if OS(MACOSX) 159 #if OS(MACOSX)
159 const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const; 160 const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 #endif 294 #endif
294 else 295 else
295 width = platformWidthForGlyph(glyph); 296 width = platformWidthForGlyph(glyph);
296 297
297 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); 298 m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
298 return width; 299 return width;
299 } 300 }
300 301
301 } // namespace WebCore 302 } // namespace WebCore
302 #endif // SimpleFontData_h 303 #endif // SimpleFontData_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/SegmentedFontData.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698