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

Unified Diff: Source/platform/fonts/mac/FontPlatformDataMac.mm

Issue 697473005: Pass indication of locally created typeface to SkCreateTypefaceFromCTFont (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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/mac/FontCustomPlatformDataMac.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/FontPlatformDataMac.mm
diff --git a/Source/platform/fonts/mac/FontPlatformDataMac.mm b/Source/platform/fonts/mac/FontPlatformDataMac.mm
index 833692d9cc280454631886462a48552a7b960692..3782b5e26f5e11413d048e0668ae756ab176b93e 100644
--- a/Source/platform/fonts/mac/FontPlatformDataMac.mm
+++ b/Source/platform/fonts/mac/FontPlatformDataMac.mm
@@ -79,6 +79,7 @@ FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
, m_isCompositeFontReference(false)
, m_widthVariant(widthVariant)
, m_font(nsFont)
+ , m_localFont(false)
, m_isHashTableDeletedValue(false)
{
ASSERT_ARG(nsFont, nsFont);
@@ -110,6 +111,7 @@ void FontPlatformData::platformDataInit(const FontPlatformData& f)
m_cgFont = f.m_cgFont;
m_CTFont = f.m_CTFont;
+ m_localFont = f.m_localFont;
m_inMemoryFont = f.m_inMemoryFont;
m_harfBuzzFace = f.m_harfBuzzFace;
@@ -127,6 +129,7 @@ const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformD
CFRelease(m_font);
m_font = f.m_font;
m_CTFont = f.m_CTFont;
+ m_localFont = f.m_localFont;
m_inMemoryFont = f.m_inMemoryFont;
m_harfBuzzFace = f.m_harfBuzzFace;
@@ -172,6 +175,7 @@ void FontPlatformData::setFont(NSFont *font)
}
#endif
m_CTFont = nullptr;
+ m_localFont = false;
}
bool FontPlatformData::roundsGlyphAdvances() const
« no previous file with comments | « Source/platform/fonts/mac/FontCustomPlatformDataMac.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698