FontFace WIP

third_party/WebKit/Source/core/css/FontFace.h

Index: third_party/WebKit/Source/core/css/FontFace.h
diff --git a/third_party/WebKit/Source/core/css/FontFace.h b/third_party/WebKit/Source/core/css/FontFace.h
index 6365317cb0e3aa650a4495e6c42cc8e974863abe..ffca0b0e198abd8e28a37c74853aae0cbfd73935 100644
--- a/third_party/WebKit/Source/core/css/FontFace.h
+++ b/third_party/WebKit/Source/core/css/FontFace.h
@@ -76,7 +76,7 @@ public:
     String featureSettings() const;
 
     // FIXME: Changing these attributes should affect font matching.
-    void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) { m_family = s; }
+    void setFamily(ExecutionContext*, const String&, ExceptionState&);
     void setStyle(ExecutionContext*, const String&, ExceptionState&);
     void setWeight(ExecutionContext*, const String&, ExceptionState&);
     void setStretch(ExecutionContext*, const String&, ExceptionState&);
@@ -125,7 +125,6 @@ private:
     void setPropertyFromString(const Document*, const String&, CSSPropertyID, ExceptionState* = 0);
     bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
     bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);
-    bool setFamilyValue(CSSPrimitiveValue*);
     void loadInternal(ExecutionContext*);
     ScriptPromise fontStatusPromise(ScriptState*);