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

Unified Diff: Source/platform/fonts/FontDescription.h

Issue 157853002: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/testing/InternalSettings.cpp ('k') | Source/platform/fonts/GenericFontFamilySettings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontDescription.h
diff --git a/Source/platform/fonts/FontDescription.h b/Source/platform/fonts/FontDescription.h
index f9244676a873df94f3d77207f6a73cb703ac3a94..54cdb9d99b1d104e86059549d146a1c57a48c0e0 100644
--- a/Source/platform/fonts/FontDescription.h
+++ b/Source/platform/fonts/FontDescription.h
@@ -118,11 +118,7 @@
FontWeight lighterWeight() const;
FontWeight bolderWeight() const;
GenericFamilyType genericFamily() const { return static_cast<GenericFamilyType>(m_genericFamily); }
-#if OS(MACOSX)
- bool usePrinterFont() const { return false; }
-#else
bool usePrinterFont() const { return m_usePrinterFont; }
-#endif
// only use fixed default size when there is only one font family, and that family is "monospace"
bool useFixedDefaultSize() const { return genericFamily() == MonospaceFamily && !family().next() && family().family() == FontFamilyNames::webkit_monospace; }
Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
@@ -158,7 +154,11 @@
void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
void setWeight(FontWeight w) { m_weight = w; }
void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; }
+#if OS(MACOSX)
+ void setUsePrinterFont(bool) { }
+#else
void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
+#endif
void setKerning(Kerning kerning) { m_kerning = kerning; updateTypesettingFeatures(); }
void setCommonLigaturesState(LigaturesState commonLigaturesState) { m_commonLigaturesState = commonLigaturesState; updateTypesettingFeatures(); }
void setDiscretionaryLigaturesState(LigaturesState discretionaryLigaturesState) { m_discretionaryLigaturesState = discretionaryLigaturesState; }
« no previous file with comments | « Source/core/testing/InternalSettings.cpp ('k') | Source/platform/fonts/GenericFontFamilySettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698