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

Unified Diff: Source/core/testing/InternalSettings.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/core/page/Page.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/testing/InternalSettings.cpp
diff --git a/Source/core/testing/InternalSettings.cpp b/Source/core/testing/InternalSettings.cpp
index 294040255aef3cfa28759f9312b6f06fe3227bfb..6aa10f2d04c7cf0634324641c5dba6baf39ee7b2 100644
--- a/Source/core/testing/InternalSettings.cpp
+++ b/Source/core/testing/InternalSettings.cpp
@@ -222,7 +222,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setStandardFontFamily(family, code);
+ settings()->genericFontFamilySettings().setStandard(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -232,7 +232,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setSerifFontFamily(family, code);
+ settings()->genericFontFamilySettings().setSerif(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -242,7 +242,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setSansSerifFontFamily(family, code);
+ settings()->genericFontFamilySettings().setSansSerif(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -252,7 +252,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setFixedFontFamily(family, code);
+ settings()->genericFontFamilySettings().setFixed(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -262,7 +262,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setCursiveFontFamily(family, code);
+ settings()->genericFontFamilySettings().setCursive(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -272,7 +272,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setFantasyFontFamily(family, code);
+ settings()->genericFontFamilySettings().setFantasy(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
@@ -282,7 +282,7 @@
UScriptCode code = scriptNameToCode(script);
if (code == USCRIPT_INVALID_CODE)
return;
- settings()->setPictographFontFamily(family, code);
+ settings()->genericFontFamilySettings().setPictograph(family, code);
m_page->setNeedsRecalcStyleInAllFrames();
}
« no previous file with comments | « Source/core/page/Page.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698