[CSS Font Loading] Remove FontFace#ready, fold its functionality into FontFace#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 364 matching lines @@
 
 void FontFace::setLoadStatus(LoadStatus status)
 {
     m_status = status;
     if (m_status == Error)
         m_error = DOMError::create(NetworkError);
     if (m_status == Loaded || m_status == Error)
         resolveReadyPromises();
 }
 
-void FontFace::load(ExecutionContext* context)
-{
-    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();
-}
-
-ScriptPromise FontFace::ready(ExecutionContext* context)
+ScriptPromise FontFace::load(ExecutionContext* context)
 {
     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());
+
+        CSSFontSelector* fontSelector = toDocument(context)->styleEngine()->fontSelector();
+        m_cssFontFace->load(fontDescription, fontSelector);
+        fontSelector->loadPendingFonts();
+    }
     return promise;
 }
 
 void FontFace::resolveReadyPromises()
 {
     for (size_t i = 0; i < m_readyResolvers.size(); i++)
         m_readyResolvers[i]->resolve(this);
     m_readyResolvers.clear();
 }
 
@@ skipping 182 matching lines @@
     visitor->trace(m_featureSettings);
     visitor->trace(m_error);
 }
 
 bool FontFace::hadBlankText() const
 {
     return m_cssFontFace->hadBlankText();
 }
 
 } // namespace WebCore