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

Side by Side Diff: Source/core/frame/Settings.cpp

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reset when Settings is changed Created 7 years 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) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed.
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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void Settings::setOpenGLMultisamplingEnabled(bool flag) 168 void Settings::setOpenGLMultisamplingEnabled(bool flag)
169 { 169 {
170 if (m_openGLMultisamplingEnabled == flag) 170 if (m_openGLMultisamplingEnabled == flag)
171 return; 171 return;
172 172
173 m_openGLMultisamplingEnabled = flag; 173 m_openGLMultisamplingEnabled = flag;
174 invalidate(SettingsDelegate::MultisamplingChange); 174 invalidate(SettingsDelegate::MultisamplingChange);
175 } 175 }
176 176
177 void Settings::setStandardFontFamily(const AtomicString& font, UScriptCode scrip t)
178 {
179 m_genericFontFamilySettings.setStandard(font, script);
180 invalidate(SettingsDelegate::FontFamilyChange);
181 }
182
183 void Settings::setFixedFontFamily(const AtomicString& font, UScriptCode script)
184 {
185 m_genericFontFamilySettings.setFixed(font, script);
186 invalidate(SettingsDelegate::FontFamilyChange);
187 }
188
189 void Settings::setSerifFontFamily(const AtomicString& font, UScriptCode script)
190 {
191 m_genericFontFamilySettings.setSerif(font, script);
192 invalidate(SettingsDelegate::FontFamilyChange);
193 }
194
195 void Settings::setSansSerifFontFamily(const AtomicString& font, UScriptCode scri pt)
196 {
197 m_genericFontFamilySettings.setSansSerif(font, script);
198 invalidate(SettingsDelegate::FontFamilyChange);
199 }
200
201 void Settings::setCursiveFontFamily(const AtomicString& font, UScriptCode script )
202 {
203 m_genericFontFamilySettings.setCursive(font, script);
204 invalidate(SettingsDelegate::FontFamilyChange);
205 }
206
207 void Settings::setFantasyFontFamily(const AtomicString& font, UScriptCode script )
208 {
209 m_genericFontFamilySettings.setFantasy(font, script);
210 invalidate(SettingsDelegate::FontFamilyChange);
211 }
212
213 void Settings::setPictographFontFamily(const AtomicString& font, UScriptCode scr ipt)
214 {
215 m_genericFontFamilySettings.setPictograph(font, script);
216 invalidate(SettingsDelegate::FontFamilyChange);
217 }
218
177 } // namespace WebCore 219 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698