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

Unified Diff: Source/platform/fonts/GenericFontFamilySettings.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/platform/fonts/GenericFontFamilySettings.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/GenericFontFamilySettings.cpp
diff --git a/Source/platform/fonts/GenericFontFamilySettings.cpp b/Source/platform/fonts/GenericFontFamilySettings.cpp
index 7f436745e7a587254f99165157a888c6bfbddc04..27916d24ed64c75f00f9468a80ad51149e4348fe 100644
--- a/Source/platform/fonts/GenericFontFamilySettings.cpp
+++ b/Source/platform/fonts/GenericFontFamilySettings.cpp
@@ -44,6 +44,18 @@ GenericFontFamilySettings::GenericFontFamilySettings(const GenericFontFamilySett
{
}
+GenericFontFamilySettings& GenericFontFamilySettings::operator=(const GenericFontFamilySettings& other)
+{
+ m_standardFontFamilyMap = other.m_standardFontFamilyMap;
+ m_serifFontFamilyMap = other.m_serifFontFamilyMap;
+ m_fixedFontFamilyMap = other.m_fixedFontFamilyMap;
+ m_sansSerifFontFamilyMap = other.m_sansSerifFontFamilyMap;
+ m_cursiveFontFamilyMap = other.m_cursiveFontFamilyMap;
+ m_fantasyFontFamilyMap = other.m_fantasyFontFamilyMap;
+ m_pictographFontFamilyMap = other.m_pictographFontFamilyMap;
+ return *this;
+}
+
// Sets the entry in the font map for the given script. If family is the empty string, removes the entry instead.
void GenericFontFamilySettings::setGenericFontFamilyMap(ScriptFontFamilyMap& fontMap, const AtomicString& family, UScriptCode script)
{
« no previous file with comments | « Source/platform/fonts/GenericFontFamilySettings.h ('k') | Source/web/WebSettingsImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698