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

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: Patch for landing Created 6 years, 10 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 ae0e04c3af8b7170e06370129e66a6a2983e29cc..12b39530c7ee179e4b5d3ce4e9919bbd2239410b 100644
--- a/Source/core/testing/InternalSettings.cpp
+++ b/Source/core/testing/InternalSettings.cpp
@@ -232,7 +232,7 @@ void InternalSettings::setStandardFontFamily(const AtomicString& family, const S
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setStandard(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -242,7 +242,7 @@ void InternalSettings::setSerifFontFamily(const AtomicString& family, const Stri
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setSerif(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setSansSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -252,7 +252,7 @@ void InternalSettings::setSansSerifFontFamily(const AtomicString& family, const
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setSansSerif(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setFixedFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -262,7 +262,7 @@ void InternalSettings::setFixedFontFamily(const AtomicString& family, const Stri
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setFixed(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setCursiveFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -272,7 +272,7 @@ void InternalSettings::setCursiveFontFamily(const AtomicString& family, const St
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setCursive(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setFantasyFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -282,7 +282,7 @@ void InternalSettings::setFantasyFontFamily(const AtomicString& family, const St
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setFantasy(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setPictographFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
@@ -292,12 +292,13 @@ void InternalSettings::setPictographFontFamily(const AtomicString& family, const
if (code == USCRIPT_INVALID_CODE)
return;
settings()->genericFontFamilySettings().setPictograph(family, code);
- m_page->setNeedsRecalcStyleInAllFrames();
+ settings()->notifyGenericFontFamilyChange();
}
void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionState& exceptionState)
{
InternalSettingsGuardForSettings();
+ settings()->setTextAutosizingEnabled(enabled);
m_page->inspectorController().setTextAutosizingEnabled(enabled);
}
« 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