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

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

Issue 142703003: Make PopupMenuTest run on all platforms. (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/FontFallbackList.h ('k') | Source/web/tests/PopupMenuTest.cpp » ('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 * 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 ASSERT(FontCache::fontCache()->generation() == m_generation); 189 ASSERT(FontCache::fontCache()->generation() == m_generation);
190 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); 190 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex);
191 if (result) { 191 if (result) {
192 m_fontList.append(result); 192 m_fontList.append(result);
193 if (result->isLoading()) 193 if (result->isLoading())
194 m_loadingCustomFonts = true; 194 m_loadingCustomFonts = true;
195 } 195 }
196 return result.get(); 196 return result.get();
197 } 197 }
198 198
199 void FontFallbackList::setPlatformFont(const FontPlatformData& platformData)
200 {
201 m_familyIndex = cAllFamiliesScanned;
202 RefPtr<FontData> fontData = FontCache::fontCache()->fontDataFromFontPlatform Data(&platformData);
203 m_fontList.append(fontData);
204 } 199 }
205
206 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontFallbackList.h ('k') | Source/web/tests/PopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698