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

Unified Diff: third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp

Issue 1944993003: Move most of FontRenderStyle manipulation code into its own file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more typo fix Created 4 years, 7 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
Index: third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
index 2a461c6a8a234269bb882e81228bc491a6dc8956..e6f42cb4a1f9505f00dca43dee4d939932aa7e01 100644
--- a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
@@ -116,7 +116,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
, m_syntheticItalic(src.m_syntheticItalic)
, m_orientation(src.m_orientation)
#if OS(LINUX) || OS(ANDROID)
- , m_style(src.m_style)
+ , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style()))
#endif
, m_harfBuzzFace(nullptr)
, m_isHashTableDeletedValue(false)
@@ -126,7 +126,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
, m_minSizeForSubpixel(src.m_minSizeForSubpixel)
#endif
{
-#if !OS(MACOSX)
+#if OS(WIN)
querySystemForRenderStyle();
#endif
}
@@ -142,6 +142,9 @@ FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf,
, m_syntheticBold(syntheticBold)
, m_syntheticItalic(syntheticItalic)
, m_orientation(orientation)
+#if OS(LINUX) || OS(ANDROID)
+ , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style()))
+#endif
, m_isHashTableDeletedValue(false)
#if OS(WIN)
, m_paintTextFlags(0)
@@ -149,7 +152,7 @@ FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf,
, m_minSizeForSubpixel(0)
#endif
{
-#if !OS(MACOSX)
+#if OS(WIN)
querySystemForRenderStyle();
#endif
}
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/FontPlatformData.h ('k') | third_party/WebKit/Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698