Introduce typeface cache in blink::FontCache

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

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * 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.
@@ skipping 30 matching lines @@
 
 namespace blink {
 
 class FontDescription;
 
 enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMarkVariant };
 
 class PLATFORM_EXPORT SimpleFontData : public FontData {
 public:
     // Used to create platform fonts.
-    static PassRefPtr<SimpleFontData> create(const FontPlatformData& platformData, PassRefPtr<CustomFontData> customData = nullptr, bool isTextOrientationFallback = false)
+    static PassRefPtr<SimpleFontData> create(const FontPlatformData& platformData, float fontSize, PassRefPtr<CustomFontData> customData = nullptr, bool isTextOrientationFallback = false)
     {
-        return adoptRef(new SimpleFontData(platformData, customData, isTextOrientationFallback));
+        return adoptRef(new SimpleFontData(platformData, fontSize, customData, isTextOrientationFallback));
     }
 
     ~SimpleFontData() override;
 
     const FontPlatformData& platformData() const { return m_platformData; }
+    float size() const { return m_fontSize; }
+    const FontRenderStyle& style() const { return m_style; }
+
     const OpenTypeVerticalData* verticalData() const { return m_verticalData.get(); }
 
     PassRefPtr<SimpleFontData> smallCapsFontData(const FontDescription&) const;
     PassRefPtr<SimpleFontData> emphasisMarkFontData(const FontDescription&) const;
 
     PassRefPtr<SimpleFontData> variantFontData(const FontDescription& description, FontDataVariant variant) const
     {
         switch (variant) {
         case SmallCapsVariant:
             return smallCapsFontData(description);
         case EmphasisMarkVariant:
             return emphasisMarkFontData(description);
         case AutoVariant:
         case NormalVariant:
             break;
         }
         ASSERT_NOT_REACHED();
         return const_cast<SimpleFontData*>(this);
     }
 
     PassRefPtr<SimpleFontData> verticalRightOrientationFontData() const;
     PassRefPtr<SimpleFontData> uprightOrientationFontData() const;
 
     bool hasVerticalGlyphs() const { return m_hasVerticalGlyphs; }
     bool isTextOrientationFallback() const { return m_isTextOrientationFallback; }
     bool isTextOrientationFallbackOf(const SimpleFontData*) const;
 
     FontMetrics& getFontMetrics() { return m_fontMetrics; }
     const FontMetrics& getFontMetrics() const { return m_fontMetrics; }
-    float sizePerUnit() const { return platformData().size() / (getFontMetrics().unitsPerEm() ? getFontMetrics().unitsPerEm() : 1); }
-    float internalLeading() const { return getFontMetrics().floatHeight() - platformData().size(); }
+    float sizePerUnit() const { return m_fontSize / (getFontMetrics().unitsPerEm() ? getFontMetrics().unitsPerEm() : 1); }
+    float internalLeading() const { return getFontMetrics().floatHeight() - m_fontSize; }
 
     float maxCharWidth() const { return m_maxCharWidth; }
     void setMaxCharWidth(float maxCharWidth) { m_maxCharWidth = maxCharWidth; }
 
     float avgCharWidth() const { return m_avgCharWidth; }
     void setAvgCharWidth(float avgCharWidth) { m_avgCharWidth = avgCharWidth; }
 
     FloatRect boundsForGlyph(Glyph) const;
     float widthForGlyph(Glyph glyph) const;
     FloatRect platformBoundsForGlyph(Glyph) const;
@@ skipping 21 matching lines @@
     void setMissingGlyphData(const GlyphData& glyphData) { m_missingGlyphData = glyphData; }
 
     bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
 
     CustomFontData* customFontData() const { return m_customFontData.get(); }
 
     // Implemented by the platform.
     virtual bool fillGlyphPage(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength) const;
 
 protected:
-    SimpleFontData(const FontPlatformData&, PassRefPtr<CustomFontData> customData, bool isTextOrientationFallback = false);
+    SimpleFontData(const FontPlatformData&, float fontSize, PassRefPtr<CustomFontData> customData, bool isTextOrientationFallback = false);
 
     SimpleFontData(PassRefPtr<CustomFontData> customData, float fontSize, bool syntheticBold, bool syntheticItalic);
 
 private:
     void platformInit();
     void platformGlyphInit();
 
     PassRefPtr<SimpleFontData> createScaledFontData(const FontDescription&, float scaleFactor) const;
     PassRefPtr<SimpleFontData> platformCreateScaledFontData(const FontDescription&, float scaleFactor) const;
 
     FontMetrics m_fontMetrics;
     float m_maxCharWidth;
     float m_avgCharWidth;
 
     FontPlatformData m_platformData;
+    float m_fontSize;
+    FontRenderStyle m_style;
 
     mutable OwnPtr<GlyphMetricsMap<FloatRect>> m_glyphToBoundsMap;
     mutable GlyphMetricsMap<float> m_glyphToWidthMap;
 
     bool m_isTextOrientationFallback;
     RefPtr<OpenTypeVerticalData> m_verticalData;
     bool m_hasVerticalGlyphs;
 
     Glyph m_spaceGlyph;
     float m_spaceWidth;
@@ skipping 54 matching lines @@
     width = platformWidthForGlyph(glyph);
 
     m_glyphToWidthMap.setMetricsForGlyph(glyph, width);
     return width;
 }
 
 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false);
 
 } // namespace blink
 #endif // SimpleFontData_h