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

Unified Diff: Source/core/testing/InternalSettings.cpp

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added 2 layout tests 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/testing/InternalSettings.cpp
diff --git a/Source/core/testing/InternalSettings.cpp b/Source/core/testing/InternalSettings.cpp
index 41c75658894f5bed5f9f7aade53cfe6c0b44d0f5..c4da7ddae4095bb6ebbac8edc1c0aba51d4a3b6e 100644
--- a/Source/core/testing/InternalSettings.cpp
+++ b/Source/core/testing/InternalSettings.cpp
@@ -222,7 +222,7 @@ void InternalSettings::setStandardFontFamily(const String& family, const String&
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setStandard(family, code);
+ settings()->setStandardFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -232,7 +232,7 @@ void InternalSettings::setSerifFontFamily(const String& family, const String& sc
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setSerif(family, code);
+ settings()->setSerifFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -242,7 +242,7 @@ void InternalSettings::setSansSerifFontFamily(const String& family, const String
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setSansSerif(family, code);
+ settings()->setSansSerifFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -252,7 +252,7 @@ void InternalSettings::setFixedFontFamily(const String& family, const String& sc
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setFixed(family, code);
+ settings()->setFixedFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -262,7 +262,7 @@ void InternalSettings::setCursiveFontFamily(const String& family, const String&
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setCursive(family, code);
+ settings()->setCursiveFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -272,7 +272,7 @@ void InternalSettings::setFantasyFontFamily(const String& family, const String&
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setFantasy(family, code);
+ settings()->setFantasyFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -282,7 +282,7 @@ void InternalSettings::setPictographFontFamily(const String& family, const Strin
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->genericFontFamilySettings().setPictograph(family, code);
+ settings()->setPictographFontFamily(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}

Powered by Google App Engine
This is Rietveld 408576698