FontFace WIP

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

 /*
  * Copyright (C) 2013 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 58 matching lines @@
 
     const AtomicString& family() const { return m_family; }
     String style() const;
     String weight() const;
     String stretch() const;
     String unicodeRange() const;
     String variant() const;
     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&);
     void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&);
     void setVariant(ExecutionContext*, const String&, ExceptionState&);
     void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&);
 
     String status() const;
     ScriptPromise loaded(ScriptState* scriptState) { return fontStatusPromise(scriptState); }
 
@@ skipping 28 matching lines @@
     static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const AtomicString& family, const String& source, const FontFaceDescriptors&);
 
     explicit FontFace(ExecutionContext*);
     FontFace(ExecutionContext*, const AtomicString& family, const FontFaceDescriptors&);
 
     void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
     void initCSSFontFace(const unsigned char* data, unsigned size);
     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*);
 
     using LoadedProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, RawPtrWillBeMember<FontFace>, Member<DOMException>>;
 
     AtomicString m_family;
     String m_otsParseMessage;
     RefPtrWillBeMember<CSSValue> m_src;
     RefPtrWillBeMember<CSSValue> m_style;
     RefPtrWillBeMember<CSSValue> m_weight;
     RefPtrWillBeMember<CSSValue> m_stretch;
     RefPtrWillBeMember<CSSValue> m_unicodeRange;
     RefPtrWillBeMember<CSSValue> m_variant;
     RefPtrWillBeMember<CSSValue> m_featureSettings;
     LoadStatus m_status;
     PersistentWillBeMember<DOMException> m_error;
 
     PersistentWillBeMember<LoadedProperty> m_loadedProperty;
     OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;
     WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks;
 };
 
 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>;
 
 } // namespace blink
 
 #endif // FontFace_h