Use unicode-range to prevent unnecessary @font-face donwnloads

Source/core/css/CSSFontFaceSource.h

 /*
  * Copyright (C) 2007, 2008, 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 33 matching lines @@
 class SVGFontFaceElement;
 #endif
 
 
 class CSSFontFaceSource : public FontResourceClient {
 public:
     CSSFontFaceSource(const String&, FontResource* = 0);
     virtual ~CSSFontFaceSource();
 
     bool isLocal() const;
+    bool isLoading() const;
     bool isLoaded() const;
     bool isValid() const;
 
     const AtomicString& string() const { return m_string; }
 
     void setFontFace(CSSFontFace* face) { m_face = face; }
 
     virtual void didStartFontLoad(FontResource*) OVERRIDE;
     virtual void fontLoaded(FontResource*);
 
     PassRefPtr<SimpleFontData> getFontData(const FontDescription&, bool syntheticBold, bool syntheticItalic, CSSFontSelector*);
 
     void pruneTable();
 
 #if ENABLE(SVG_FONTS)
     SVGFontFaceElement* svgFontFaceElement() const;
     void setSVGFontFaceElement(PassRefPtr<SVGFontFaceElement>);
     bool isSVGFontFaceSource() const;
     void setHasExternalSVGFont(bool value) { m_hasExternalSVGFont = value; }
 #endif
 
     bool isDecodeError() const;
     bool ensureFontData();
     bool isLocalFontAvailable(const FontDescription&);
     void willUseFontData();
+    void beginLoadingFontSoon();
 
 private:
+    typedef HashMap<unsigned, RefPtr<SimpleFontData> > FontDataTable;
+
     class FontLoadHistograms {
     public:
         enum UsageType {
             StyledAndUsed,
             StyledButNotUsed,
             NotStyledButUsed,
             UsageTypeMax
         };
         FontLoadHistograms() : m_styledTime(0), m_loadStartTime(0) { }
         ~FontLoadHistograms();
         void willUseFontData();
         void loadStarted();
         void recordLocalFont(bool loadSuccess);
         void recordRemoteFont(const FontResource*);
     private:
         const char* histogramName(const FontResource*);
         double m_styledTime;
         double m_loadStartTime;
     };
 
     void startLoadingTimerFired(Timer<CSSFontFaceSource>*);
 
     AtomicString m_string; // URI for remote, built-in font name for local.
     ResourcePtr<FontResource> m_font; // For remote fonts, a pointer to our cached resource.
     CSSFontFace* m_face; // Our owning font face.
-    HashMap<unsigned, RefPtr<SimpleFontData> > m_fontDataTable; // The hash key is composed of size synthetic styles.
+    FontDataTable m_fontDataTable; // The hash key is composed of size synthetic styles.

[dglazkov, 2013/09/10 15:26:41]

Should the comment go with the typedef?

[Kunihiko Sakamoto, 2013/09/11 13:28:09]

Done.

     FontLoadHistograms m_histograms;
 
 #if ENABLE(SVG_FONTS)
     RefPtr<SVGFontFaceElement> m_svgFontFaceElement;
     RefPtr<SVGFontElement> m_externalSVGFontElement;
     bool m_hasExternalSVGFont;
 #endif
 };
 
 }
 
 #endif