Fix promise resolution of FontFaceSet#load()

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 75 matching lines @@
     LoadStatus loadStatus() const { return m_status; }
     void setLoadStatus(LoadStatus);
     DOMError* error() const { return m_error.get(); }
     FontTraits traits() const;
     CSSFontFace* cssFontFace() { return m_cssFontFace.get(); }
 
     void trace(Visitor*);
 
     bool hadBlankText() const;
 
+    class LoadFontCallback : public RefCounted<LoadFontCallback> {
+    public:
+        virtual ~LoadFontCallback() { }
+        virtual void notifyLoaded(FontFace*) = 0;
+        virtual void notifyError(FontFace*) = 0;
+    };
+    void load(PassRefPtr<LoadFontCallback>, ExecutionContext*);

[dglazkov, 2014/03/19 15:42:34]

"Load" overload :)

You even have loadInternal now. I wonder if we could name them a bit more
specifically so that there's less confusion for future us looking at this code.

[Kunihiko Sakamoto, 2014/03/20 01:06:32]

Renamed to loadWithCallback.

+
 private:
     FontFace();
 
     void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);
     void initCSSFontFace(const unsigned char* data, unsigned size);
     void setPropertyFromString(const Document*, const String&, CSSPropertyID, ExceptionState&);
     bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);
     bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);
     bool setFamilyValue(CSSValueList*);
     void resolveReadyPromises();
+    void loadInternal(ExecutionContext*);
 
     AtomicString m_family;
     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;
     RefPtrWillBeMember<DOMError> m_error;
 
     Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers;
     OwnPtr<CSSFontFace> m_cssFontFace;
+    Vector<RefPtr<LoadFontCallback> > m_callbacks;
 };
 
 typedef Vector<RefPtr<FontFace> > FontFaceArray;
 
 } // namespace WebCore
 
 #endif // FontFace_h