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

Side by Side Diff: Source/platform/fonts/FontFallbackList.cpp

Issue 641763003: RELEASE_ASSERT if last resort fallback font cannot be loaded. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | « no previous file | 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 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 for (unsigned fontIndex = 0; ; ++fontIndex) { 138 for (unsigned fontIndex = 0; ; ++fontIndex) {
139 const FontData* fontData = fontDataAt(fontDescription, fontIndex); 139 const FontData* fontData = fontDataAt(fontDescription, fontIndex);
140 if (!fontData) { 140 if (!fontData) {
141 // All fonts are custom fonts and are loading. Return the first Font Data. 141 // All fonts are custom fonts and are loading. Return the first Font Data.
142 fontData = fontDataAt(fontDescription, 0); 142 fontData = fontDataAt(fontDescription, 0);
143 if (fontData) 143 if (fontData)
144 return fontData->fontDataForCharacter(space); 144 return fontData->fontDataForCharacter(space);
145 145
146 SimpleFontData* lastResortFallback = FontCache::fontCache()->getLast ResortFallbackFont(fontDescription).get(); 146 SimpleFontData* lastResortFallback = FontCache::fontCache()->getLast ResortFallbackFont(fontDescription).get();
147 ASSERT(lastResortFallback); 147 RELEASE_ASSERT(lastResortFallback);
148 return lastResortFallback; 148 return lastResortFallback;
149 } 149 }
150 150
151 if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsC haracter(space)) 151 if (fontData->isSegmented() && !toSegmentedFontData(fontData)->containsC haracter(space))
152 continue; 152 continue;
153 153
154 const SimpleFontData* fontDataForSpace = fontData->fontDataForCharacter( space); 154 const SimpleFontData* fontDataForSpace = fontData->fontDataForCharacter( space);
155 ASSERT(fontDataForSpace); 155 ASSERT(fontDataForSpace);
156 156
157 // When a custom font is loading, we should use the correct fallback fon t to layout the text. 157 // When a custom font is loading, we should use the correct fallback fon t to layout the text.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); 238 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex);
239 if (result) { 239 if (result) {
240 m_fontList.append(result); 240 m_fontList.append(result);
241 if (result->isLoadingFallback()) 241 if (result->isLoadingFallback())
242 m_hasLoadingFallback = true; 242 m_hasLoadingFallback = true;
243 } 243 }
244 return result.get(); 244 return result.get();
245 } 245 }
246 246
247 } // namespace blink 247 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698