Introduce typeface cache in blink::FontCache

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

 /*
  * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 61 matching lines @@
     USING_FAST_MALLOC(FontPlatformData);
 public:
     // Used for deleted values in the font cache's hash tables. The hash table
     // will create us with this structure, and it will compare other values
     // to this "Deleted" one. It expects the Deleted one to be differentiable
     // from the 0 one (created with the empty constructor), so we can't just
     // set everything to 0.
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
     FontPlatformData(const FontPlatformData&);
-    FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);
-    FontPlatformData(const FontPlatformData& src, float textSize);
+    FontPlatformData(bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);
 #if OS(MACOSX)
     FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false, FontOrientation = FontOrientation::Horizontal);
 #endif
-    FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);
+    FontPlatformData(PassRefPtr<SkTypeface>, const char* name, bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);
     ~FontPlatformData();
 
 #if OS(MACOSX)
     CTFontRef ctFont() const;
     CGFontRef cgFont() const;
 #endif
 
     String fontFamilyName() const;
-    float size() const { return m_textSize; }
     bool syntheticBold() const { return m_syntheticBold; }
     bool syntheticItalic() const { return m_syntheticItalic; }
 
     SkTypeface* typeface() const;
     HarfBuzzFace* harfBuzzFace() const;
-    bool hasSpaceInLigaturesOrKerning(TypesettingFeatures) const;
+    bool hasSpaceInLigaturesOrKerning(float fontSize, const FontRenderStyle&, TypesettingFeatures) const;
     SkFontID uniqueID() const;
     unsigned hash() const;
 
     FontOrientation orientation() const { return m_orientation; }
     bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(m_orientation); }
     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
     void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }
     void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheticItalic; }
     bool operator==(const FontPlatformData&) const;
     const FontPlatformData& operator=(const FontPlatformData&);
@@ skipping 12 matching lines @@
 #endif
     bool fontContainsCharacter(UChar32 character);
 
     PassRefPtr<OpenTypeVerticalData> verticalData() const;
     PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
 
 #if !OS(MACOSX)
     // The returned styles are all actual styles without FontRenderStyle::NoPreference.
     const FontRenderStyle& getFontRenderStyle() const { return m_style; }
 #endif
-    void setupPaint(SkPaint*, float deviceScaleFactor = 1, const Font* = 0) const;
+    void setupPaint(SkPaint*) const;
 
 #if OS(WIN)
     int paintTextFlags() const { return m_paintTextFlags; }
-#else
-    static void setHinting(SkPaint::Hinting);
-    static void setAutoHint(bool);
-    static void setUseBitmaps(bool);
-    static void setAntiAlias(bool);
-    static void setSubpixelRendering(bool);
 #endif
 
 private:
-#if !OS(MACOSX)
-    void querySystemForRenderStyle();
-#endif
-
     RefPtr<SkTypeface> m_typeface;
 #if !OS(WIN)
     CString m_family;
 #endif
 
 public:
-    float m_textSize;
     bool m_syntheticBold;
     bool m_syntheticItalic;
     FontOrientation m_orientation;
 private:
 #if !OS(MACOSX)
     FontRenderStyle m_style;
 #endif
 
     mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
     bool m_isHashTableDeletedValue;
 #if OS(WIN)
     int m_paintTextFlags;
     unsigned m_minSizeForAntiAlias;
     float m_minSizeForSubpixel;
 #endif
 };
 
 } // namespace blink
 
 #endif // ifdef FontPlatformData_h