Pass indication of locally created typeface to SkCreateTypefaceFromCTFont

Source/platform/fonts/FontPlatformData.cpp

 /*
  * Copyright (C) 2011 Brent Fulgham
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 35 matching lines @@
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
 #endif
     , m_widthVariant(RegularWidth)
 #if OS(MACOSX)
     , m_font(nullptr)
+    , m_localFont(false)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(true)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData()
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
 #endif
     , m_widthVariant(RegularWidth)
 #if OS(MACOSX)
     , m_font(nullptr)
+    , m_localFont(false)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
 #if OS(MACOSX)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
 #endif
     , m_widthVariant(widthVariant)
 #if OS(MACOSX)
     , m_font(nullptr)
+    , m_localFont(false)
 #else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
@@ skipping 58 matching lines @@
 #endif
 {
 #if OS(MACOSX)
     platformDataInit(src);
 #else
     querySystemForRenderStyle(FontDescription::subpixelPositioning());
 #endif
 }
 
 #if OS(MACOSX)
-FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
+FontPlatformData::FontPlatformData(CGFontRef cgFont, bool localFont, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_typeface(nullptr)
     , m_family(CString())
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
     , m_widthVariant(widthVariant)
     , m_font(nullptr)
     , m_cgFont(cgFont)
+    , m_localFont(localFont)
     , m_isHashTableDeletedValue(false)
 {
 }
 
 #else
 
 FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, bool subpixelTextPosition)
     : m_typeface(tf)
 #if !OS(WIN)
     , m_family(family)
@@ skipping 83 matching lines @@
         && m_textSize == a.m_textSize
         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
         && m_syntheticBold == a.m_syntheticBold
         && m_syntheticItalic == a.m_syntheticItalic
         && m_orientation == a.m_orientation
 #if !OS(MACOSX)
         && m_style == a.m_style
 #else
         && m_isColorBitmapFont == a.m_isColorBitmapFont
         && m_isCompositeFontReference == a.m_isCompositeFontReference
+        && m_localFont == a.m_localFont
 #endif
         && m_widthVariant == a.m_widthVariant;
 }
 
 SkFontID FontPlatformData::uniqueID() const
 {
     return typeface()->uniqueID();
 }
 
 String FontPlatformData::fontFamilyName() const
@@ skipping 10 matching lines @@
 
 bool FontPlatformData::isFixedPitch() const
 {
     return typeface() && typeface()->isFixedPitch();
 }
 
 SkTypeface* FontPlatformData::typeface() const
 {
 #if OS(MACOSX)
     if (!m_typeface)
-        m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont()));
+        m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont(), m_localFont));
 #endif
     return m_typeface.get();
 }
 
 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
 {
     if (!m_harfBuzzFace)
         m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
 
     return m_harfBuzzFace.get();
@@ skipping 43 matching lines @@
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 #endif
 
 } // namespace blink