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

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

Issue 1192223002: Optimize Complex Text Shaping and Caching (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Change CachingWordShaperTest as suggested 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/FontFallbackList.h ('k') | Source/platform/fonts/FontPlatformData.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 * 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 releaseFontData(); 54 releaseFontData();
55 m_fontList.clear(); 55 m_fontList.clear();
56 m_pageZero = 0; 56 m_pageZero = 0;
57 m_pages.clear(); 57 m_pages.clear();
58 m_cachedPrimarySimpleFontData = 0; 58 m_cachedPrimarySimpleFontData = 0;
59 m_familyIndex = 0; 59 m_familyIndex = 0;
60 m_hasLoadingFallback = false; 60 m_hasLoadingFallback = false;
61 m_fontSelector = fontSelector; 61 m_fontSelector = fontSelector;
62 m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0; 62 m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0;
63 m_generation = FontCache::fontCache()->generation(); 63 m_generation = FontCache::fontCache()->generation();
64 m_widthCache.clear(); 64 m_cachingWordShaper.clear();
65 } 65 }
66 66
67 void FontFallbackList::releaseFontData() 67 void FontFallbackList::releaseFontData()
68 { 68 {
69 unsigned numFonts = m_fontList.size(); 69 unsigned numFonts = m_fontList.size();
70 for (unsigned i = 0; i < numFonts; ++i) { 70 for (unsigned i = 0; i < numFonts; ++i) {
71 if (!m_fontList[i]->isCustomFont()) { 71 if (!m_fontList[i]->isCustomFont()) {
72 ASSERT(!m_fontList[i]->isSegmented()); 72 ASSERT(!m_fontList[i]->isSegmented());
73 FontCache::fontCache()->releaseFontData(toSimpleFontData(m_fontList[ i])); 73 FontCache::fontCache()->releaseFontData(toSimpleFontData(m_fontList[ i]));
74 } 74 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 216
217 bool FontFallbackList::isValid() const 217 bool FontFallbackList::isValid() const
218 { 218 {
219 if (!m_fontSelector) 219 if (!m_fontSelector)
220 return m_fontSelectorVersion == 0; 220 return m_fontSelectorVersion == 0;
221 221
222 return m_fontSelector->version() == m_fontSelectorVersion; 222 return m_fontSelector->version() == m_fontSelectorVersion;
223 } 223 }
224 224
225 } // namespace blink 225 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontFallbackList.h ('k') | Source/platform/fonts/FontPlatformData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698