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

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

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed TextAutosizing Created 6 years, 10 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 void CSSFontSelector::beginLoadingFontSoon(FontResource* font) 209 void CSSFontSelector::beginLoadingFontSoon(FontResource* font)
210 { 210 {
211 m_fontLoader.addFontToBeginLoading(font); 211 m_fontLoader.addFontToBeginLoading(font);
212 } 212 }
213 213
214 void CSSFontSelector::loadPendingFonts() 214 void CSSFontSelector::loadPendingFonts()
215 { 215 {
216 m_fontLoader.loadPendingFonts(); 216 m_fontLoader.loadPendingFonts();
217 } 217 }
218 218
219 void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
220 {
221 ASSERT(document.frame());
222 m_genericFontFamilySettings = document.frame()->settings()->genericFontFamil ySettings();
eseidel 2014/02/14 05:39:15 I think there is just a document.settings() as wel
tasak 2014/02/14 08:27:46 Done.
219 } 223 }
224
225 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698