Introduce typeface cache in blink::FontCache

third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

 /*
  * Copyright (C) 2005, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 36 matching lines @@
 namespace blink {
 
 const float smallCapsFontSizeMultiplier = 0.7f;
 const float emphasisMarkFontSizeMultiplier = 0.5f;
 
 #if OS(LINUX) || OS(ANDROID)
 // This is the largest VDMX table which we'll try to load and parse.
 static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB
 #endif
 
-SimpleFontData::SimpleFontData(const FontPlatformData& platformData, PassRefPtr<CustomFontData> customData, bool isTextOrientationFallback)
+SimpleFontData::SimpleFontData(const FontPlatformData& platformData, float fontSize, PassRefPtr<CustomFontData> customData, bool isTextOrientationFallback)
     : m_maxCharWidth(-1)
     , m_avgCharWidth(-1)
     , m_platformData(platformData)
+    , m_fontSize(fontSize)
     , m_isTextOrientationFallback(isTextOrientationFallback)
     , m_verticalData(nullptr)
     , m_hasVerticalGlyphs(false)
     , m_customFontData(customData)
 {
     platformInit();
     platformGlyphInit();
     if (platformData.isVerticalAnyUpright() && !isTextOrientationFallback) {
         m_verticalData = platformData.verticalData();
         m_hasVerticalGlyphs = m_verticalData.get() && m_verticalData->hasVerticalMetrics();
     }
 }
 
 SimpleFontData::SimpleFontData(PassRefPtr<CustomFontData> customData, float fontSize, bool syntheticBold, bool syntheticItalic)
-    : m_platformData(FontPlatformData(fontSize, syntheticBold, syntheticItalic))
+    : m_platformData(FontPlatformData(syntheticBold, syntheticItalic))
+    , m_fontSize(fontSize)
     , m_isTextOrientationFallback(false)
     , m_verticalData(nullptr)
     , m_hasVerticalGlyphs(false)
     , m_customFontData(customData)
 {
     if (m_customFontData)
         m_customFontData->initializeFontData(this, fontSize);
 }
 
 void SimpleFontData::platformInit()
 {
-    if (!m_platformData.size()) {
+    if (!m_fontSize) {
         m_fontMetrics.reset();
         m_avgCharWidth = 0;
         m_maxCharWidth = 0;
         return;
     }
 
     SkPaint paint;
     SkPaint::FontMetrics metrics;
 
     m_platformData.setupPaint(&paint);
+    m_style.apply(&paint);
+    paint.setTextSize(SkFloatToScalar(m_fontSize));
     paint.getFontMetrics(&metrics);
     SkTypeface* face = paint.getTypeface();
     ASSERT(face);
 
     int vdmxAscent = 0, vdmxDescent = 0;
     bool isVDMXValid = false;
 
 #if OS(LINUX) || OS(ANDROID)
     // Manually digging up VDMX metrics is only applicable when bytecode hinting using FreeType.
     // With DirectWrite or CoreText, no bytecode hinting is ever done.
     // This code should be pushed into FreeType (hinted font metrics).
     static const uint32_t vdmxTag = SkSetFourByteTag('V', 'D', 'M', 'X');
-    int pixelSize = m_platformData.size() + 0.5;
+    int pixelSize = m_fontSize + 0.5;
     if (!paint.isAutohinted()
         &&    (paint.getHinting() == SkPaint::kFull_Hinting
             || paint.getHinting() == SkPaint::kNormal_Hinting))
     {
         size_t vdmxSize = face->getTableSize(vdmxTag);
         if (vdmxSize && vdmxSize < maxVDMXTableSize) {
             uint8_t* vdmxTable = (uint8_t*)WTF::Partitions::fastMalloc(vdmxSize, WTF_HEAP_PROFILER_TYPE_NAME(SimpleFontData));
             if (vdmxTable
                 && face->getTableData(vdmxTag, 0, vdmxSize, vdmxTable) == vdmxSize
                 && parseVDMX(&vdmxAscent, &vdmxDescent, vdmxTable, vdmxSize, pixelSize))
@@ skipping 175 matching lines @@
     return false;
 }
 
 PassRefPtr<SimpleFontData> SimpleFontData::verticalRightOrientationFontData() const
 {
     if (!m_derivedFontData)
         m_derivedFontData = DerivedFontData::create(isCustomFont());
     if (!m_derivedFontData->verticalRightOrientation) {
         FontPlatformData verticalRightPlatformData(m_platformData);
         verticalRightPlatformData.setOrientation(FontOrientation::Horizontal);
-        m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, isCustomFont() ? CustomFontData::create(): nullptr, true);
+        m_derivedFontData->verticalRightOrientation = create(verticalRightPlatformData, m_fontSize, isCustomFont() ? CustomFontData::create(): nullptr, true);
     }
     return m_derivedFontData->verticalRightOrientation;
 }
 
 PassRefPtr<SimpleFontData> SimpleFontData::uprightOrientationFontData() const
 {
     if (!m_derivedFontData)
         m_derivedFontData = DerivedFontData::create(isCustomFont());
     if (!m_derivedFontData->uprightOrientation)
-        m_derivedFontData->uprightOrientation = create(m_platformData, isCustomFont() ? CustomFontData::create(): nullptr, true);
+        m_derivedFontData->uprightOrientation = create(m_platformData, m_fontSize, isCustomFont() ? CustomFontData::create(): nullptr, true);
     return m_derivedFontData->uprightOrientation;
 }
 
 PassRefPtr<SimpleFontData> SimpleFontData::smallCapsFontData(const FontDescription& fontDescription) const
 {
     if (!m_derivedFontData)
         m_derivedFontData = DerivedFontData::create(isCustomFont());
     if (!m_derivedFontData->smallCaps)
         m_derivedFontData->smallCaps = createScaledFontData(fontDescription, smallCapsFontSizeMultiplier);
 
@@ skipping 39 matching lines @@
 }
 
 PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
 {
     return platformCreateScaledFontData(fontDescription, scaleFactor);
 }
 
 PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
 {
     const float scaledSize = lroundf(fontDescription.computedSize() * scaleFactor);
-    return SimpleFontData::create(FontPlatformData(m_platformData, scaledSize), isCustomFont() ? CustomFontData::create() : nullptr);
+    return SimpleFontData::create(m_platformData, scaledSize, isCustomFont() ? CustomFontData::create() : nullptr);
 }
 
 static inline void getSkiaBoundsForGlyph(SkPaint& paint, Glyph glyph, SkRect& bounds)
 {
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
     SkPath path;
     paint.getTextPath(&glyph, sizeof(glyph), 0, 0, &path);
     bounds = path.getBounds();
 
     if (!paint.isSubpixelText()) {
         SkIRect ir;
         bounds.round(&ir);
         bounds.set(ir);
     }
 }
 
 FloatRect SimpleFontData::platformBoundsForGlyph(Glyph glyph) const
 {
-    if (!m_platformData.size())
+    if (!m_fontSize)
         return FloatRect();
 
     SkASSERT(sizeof(glyph) == 2); // compile-time assert
 
     SkPaint paint;
+    m_style.apply(&paint);
+    paint.setTextSize(SkFloatToScalar(m_fontSize));
     m_platformData.setupPaint(&paint);
 
     SkRect bounds;
     getSkiaBoundsForGlyph(paint, glyph, bounds);
     return FloatRect(bounds);
 }
 
 float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
 {
-    if (!m_platformData.size())
+    if (!m_fontSize)
         return 0;
 
     SkASSERT(sizeof(glyph) == 2); // compile-time assert
 
     SkPaint paint;
-
+    m_style.apply(&paint);
+    paint.setTextSize(SkFloatToScalar(m_fontSize));
     m_platformData.setupPaint(&paint);
 
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     SkScalar width = paint.measureText(&glyph, 2);
     if (!paint.isSubpixelText())
         width = SkScalarRoundToInt(width);
     return SkScalarToFloat(width);
 }
 
 bool SimpleFontData::fillGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength) const
@@ skipping 18 matching lines @@
         if (glyphs[i]) {
             pageToFill->setGlyphDataForIndex(offset + i, glyphs[i], this);
             haveGlyphs = true;
         }
     }
 
     return haveGlyphs;
 }
 
 } // namespace blink