Fix promise resolution of FontFaceSet#load()

Source/core/css/FontFace.cpp

 /*
  * 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 360 matching lines @@
         ASSERT_NOT_REACHED();
     }
     return emptyString();
 }
 
 void FontFace::setLoadStatus(LoadStatus status)
 {
     m_status = status;
     if (m_status == Error)
         m_error = DOMError::create(NetworkError);
-    if (m_status == Loaded || m_status == Error)
+    if (m_status == Loaded || m_status == Error) {
         resolveReadyPromises();
+
+        Vector<RefPtr<LoadFontCallback> > callbacks;
+        m_callbacks.swap(callbacks);
+        for (size_t i = 0; i < callbacks.size(); ++i) {
+            if (m_status == Loaded)
+                callbacks[i]->notifyLoaded(this);
+            else
+                callbacks[i]->notifyError(this);
+        }
+    }
 }
 
 ScriptPromise FontFace::load(ExecutionContext* context)

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

This is the actual Promise FontFace.load. Maybe it should be loadWithPromise?

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

This is a method of the FontFace interface, so it'd be good to keep it
unchanged.

 {
     OwnPtr<FontFaceReadyPromiseResolver> resolver = FontFaceReadyPromiseResolver::create(context);
     ScriptPromise promise = resolver->promise();
     if (m_status == Loaded || m_status == Error)
         resolver->resolve(this);
     else
         m_readyResolvers.append(resolver.release());
 
-    if (m_status == Unloaded) {
-        FontDescription fontDescription;
-        FontFamily fontFamily;
-        fontFamily.setFamily(m_family);
-        fontDescription.setFamily(fontFamily);
-        fontDescription.setTraits(traits());
+    loadInternal(context);
+    return promise;
+}
 
-        CSSFontSelector* fontSelector = toDocument(context)->styleEngine()->fontSelector();
-        m_cssFontFace->load(fontDescription, fontSelector);
-        fontSelector->loadPendingFonts();
-    }
-    return promise;
+void FontFace::load(PassRefPtr<LoadFontCallback> callback, ExecutionContext* context)
+{
+    loadInternal(context);
+    if (m_status == Loaded)
+        callback->notifyLoaded(this);
+    else if (m_status == Error)
+        callback->notifyError(this);
+    else
+        m_callbacks.append(callback);
+}
+
+void FontFace::loadInternal(ExecutionContext* context)

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

This is the actual "load"

+{
+    if (m_status != Unloaded)
+        return;
+
+    FontDescription fontDescription;
+    FontFamily fontFamily;
+    fontFamily.setFamily(m_family);
+    fontDescription.setFamily(fontFamily);
+    fontDescription.setTraits(traits());
+
+    CSSFontSelector* fontSelector = toDocument(context)->styleEngine()->fontSelector();
+    m_cssFontFace->load(fontDescription, fontSelector);
+    fontSelector->loadPendingFonts();
 }
 
 void FontFace::resolveReadyPromises()
 {
     for (size_t i = 0; i < m_readyResolvers.size(); i++)
         m_readyResolvers[i]->resolve(this);
     m_readyResolvers.clear();
 }
 
 FontTraits FontFace::traits() const
@@ skipping 181 matching lines @@
     visitor->trace(m_featureSettings);
     visitor->trace(m_error);
 }
 
 bool FontFace::hadBlankText() const
 {
     return m_cssFontFace->hadBlankText();
 }
 
 } // namespace WebCore