Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

1 files changed, 10 insertions, 2 deletions

diff --git a/WebCore/css/CSSFontFace.h b/WebCore/css/CSSFontFace.h
index 4e2fee5..55e048c 100644
--- a/WebCore/css/CSSFontFace.h
+++ b/WebCore/css/CSSFontFace.h
@@ -42,7 +42,7 @@ class SimpleFontData;
 
 class CSSFontFace : public RefCounted<CSSFontFace> {
 public:
-    static PassRefPtr<CSSFontFace> create(FontTraitsMask traitsMask) { return adoptRef(new CSSFontFace(traitsMask)); }
+    static PassRefPtr<CSSFontFace> create(FontTraitsMask traitsMask, bool isLocalFallback = false) { return adoptRef(new CSSFontFace(traitsMask, isLocalFallback)); }
     ~CSSFontFace();
 
     FontTraitsMask traitsMask() const { return m_traitsMask; }
@@ -58,6 +58,8 @@ public:
     bool isLoaded() const;
     bool isValid() const;
 
+    bool isLocalFallback() const { return m_isLocalFallback; }
+
     void addSource(CSSFontFaceSource*);
 
     void fontLoaded(CSSFontFaceSource*);
@@ -79,10 +81,15 @@ public:
         UChar32 m_to;
     };
 
+#if ENABLE(SVG_FONTS)
+    bool hasSVGFontFaceSource() const;
+#endif
+
 private:
-    CSSFontFace(FontTraitsMask traitsMask)
+    CSSFontFace(FontTraitsMask traitsMask, bool isLocalFallback)
         : m_traitsMask(traitsMask)
         , m_activeSource(0)
+        , m_isLocalFallback(isLocalFallback)
     {
     }
 
@@ -91,6 +98,7 @@ private:
     HashSet<CSSSegmentedFontFace*> m_segmentedFontFaces;
     Vector<CSSFontFaceSource*> m_sources;
     CSSFontFaceSource* m_activeSource;
+    bool m_isLocalFallback;
 };
 
 }