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

Side by Side Diff: Source/core/css/CSSFontSelector.cpp

Issue 335393002: Should update FontFaceCache version when updating generic font-family settings. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 m_fontLoader->clearResourceFetcher(); 163 m_fontLoader->clearResourceFetcher();
164 m_document = nullptr; 164 m_document = nullptr;
165 } 165 }
166 #endif 166 #endif
167 167
168 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) 168 void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
169 { 169 {
170 if (!document.settings()) 170 if (!document.settings())
171 return; 171 return;
172 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings (); 172 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings ();
173 // Need to increment FontFaceCache version to update RenderStyles.
174 m_fontFaceCache.incrementVersion();
173 } 175 }
174 176
175 void CSSFontSelector::trace(Visitor* visitor) 177 void CSSFontSelector::trace(Visitor* visitor)
176 { 178 {
177 visitor->trace(m_document); 179 visitor->trace(m_document);
178 visitor->trace(m_fontFaceCache); 180 visitor->trace(m_fontFaceCache);
179 visitor->trace(m_clients); 181 visitor->trace(m_clients);
180 visitor->trace(m_fontLoader); 182 visitor->trace(m_fontLoader);
181 FontSelector::trace(visitor); 183 FontSelector::trace(visitor);
182 } 184 }
183 185
184 } 186 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/text/update-sans-serif-and-recalc-style-expected.html ('k') | Source/core/css/FontFaceCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698