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

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

Issue 131403008: Revert of Use removeFontFace to avoid resetting fontSelector. (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/core/frame/Settings.h ('k') | Source/core/frame/SettingsDelegate.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, 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 void Settings::setOpenGLMultisamplingEnabled(bool flag) 158 void Settings::setOpenGLMultisamplingEnabled(bool flag)
159 { 159 {
160 if (m_openGLMultisamplingEnabled == flag) 160 if (m_openGLMultisamplingEnabled == flag)
161 return; 161 return;
162 162
163 m_openGLMultisamplingEnabled = flag; 163 m_openGLMultisamplingEnabled = flag;
164 invalidate(SettingsDelegate::MultisamplingChange); 164 invalidate(SettingsDelegate::MultisamplingChange);
165 } 165 }
166 166
167 void Settings::setStandardFontFamily(const AtomicString& font, UScriptCode scrip t)
168 {
169 m_genericFontFamilySettings.setStandard(font, script);
170 invalidate(SettingsDelegate::FontFamilyChange);
171 }
172
173 void Settings::setFixedFontFamily(const AtomicString& font, UScriptCode script)
174 {
175 m_genericFontFamilySettings.setFixed(font, script);
176 invalidate(SettingsDelegate::FontFamilyChange);
177 }
178
179 void Settings::setSerifFontFamily(const AtomicString& font, UScriptCode script)
180 {
181 m_genericFontFamilySettings.setSerif(font, script);
182 invalidate(SettingsDelegate::FontFamilyChange);
183 }
184
185 void Settings::setSansSerifFontFamily(const AtomicString& font, UScriptCode scri pt)
186 {
187 m_genericFontFamilySettings.setSansSerif(font, script);
188 invalidate(SettingsDelegate::FontFamilyChange);
189 }
190
191 void Settings::setCursiveFontFamily(const AtomicString& font, UScriptCode script )
192 {
193 m_genericFontFamilySettings.setCursive(font, script);
194 invalidate(SettingsDelegate::FontFamilyChange);
195 }
196
197 void Settings::setFantasyFontFamily(const AtomicString& font, UScriptCode script )
198 {
199 m_genericFontFamilySettings.setFantasy(font, script);
200 invalidate(SettingsDelegate::FontFamilyChange);
201 }
202
203 void Settings::setPictographFontFamily(const AtomicString& font, UScriptCode scr ipt)
204 {
205 m_genericFontFamilySettings.setPictograph(font, script);
206 invalidate(SettingsDelegate::FontFamilyChange);
207 }
208
209 } // namespace WebCore 167 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Settings.h ('k') | Source/core/frame/SettingsDelegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698