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

Unified Diff: Source/web/WebSettingsImpl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebSettingsImpl.cpp
diff --git a/Source/web/WebSettingsImpl.cpp b/Source/web/WebSettingsImpl.cpp
index ec58c096bf86fbd2424603c22db0df5cfd84ce09..3e3bc46668aa0d05a4eaa05c508fe04264ab176e 100644
--- a/Source/web/WebSettingsImpl.cpp
+++ b/Source/web/WebSettingsImpl.cpp
@@ -66,37 +66,37 @@
void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setStandardFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setStandard(font, script);
}
void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setFixedFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setFixed(font, script);
}
void WebSettingsImpl::setSerifFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setSerifFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setSerif(font, script);
}
void WebSettingsImpl::setSansSerifFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setSansSerifFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setSansSerif(font, script);
}
void WebSettingsImpl::setCursiveFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setCursiveFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setCursive(font, script);
}
void WebSettingsImpl::setFantasyFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setFantasyFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setFantasy(font, script);
}
void WebSettingsImpl::setPictographFontFamily(const WebString& font, UScriptCode script)
{
- m_settings->setPictographFontFamily(font, script);
+ m_settings->genericFontFamilySettings().setPictograph(font, script);
}
void WebSettingsImpl::setDefaultFontSize(int size)
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698