[css-font-loading] Remove FontFace#ready, fold its functionality into FontFace#load.

Author: tabatkins

css-font-loading/Overview.bs

@@ -74,13 +74,7 @@ The <code>FontFace</code> Interface</h2>
 
 			readonly attribute FontFaceLoadStatus status;
 
-			// If the font face's source is url-based and its status isn't
-			// "loading" or "loaded", this kicks off the load.
-			void load();
-
-			// Returns a promise that fulfills or rejects when the font face
-			// reached "loaded" or "error" status.
-			Promise ready();
+			Promise load();
 		};
 	</pre>
 
@@ -192,7 +186,7 @@ The Constructor</h3>
 
 	Note: Note that constructing a <a idl>FontFace</a> object <strong>does not</strong> automatically add it to the document's <a>font source</a>.
 	If it's desired that the newly-constructed <a idl>FontFace</a> object is usable from CSS/etc,
-	it must be explicitly added to the <a>font source</a>.
+	it must be explicitly added to a <a>font source</a>.
 
 <h3 id='font-face-load'>
 The <code>load()</code> method</h3>
@@ -213,13 +207,14 @@ The <code>load()</code> method</h3>
 		<li>
 			If <var>font face's</var> <a>[Urls]</a> attribute is <code>null</code>,
 			or its <a for=FontFace>status</a> attribute is anything other than <code>"unloaded"</code>,
-			abort this algorithm immediately.
+			return <var>font face's</var> <a>[FontStatusPromise]</a>
+			and abort these steps.
 
 		<li>
 			Otherwise,
 			set <var>font face's</var> <a for=FontFace>status</a> attribute to "loading",
-			return immediately,
-			and follow these steps asynchronously:
+			return <var>font face's</var> <a>[FontStatusPromise]</a>,
+			and continue executing the rest of this algorithm asynchronously.
 
 		<li>
 			Using the value of <var>font face's</a> <a>[Urls]</a> attribute,

css-font-loading/Overview.html

@@ -171,13 +171,7 @@ <h2 class="heading settled heading" data-level=2 id=fontface-interface><span cla
 
     readonly attribute <a data-link-type=idl href=#enumdef-fontfaceloadstatus title=fontfaceloadstatus>FontFaceLoadStatus</a> <a class=idl-code data-global-name="FontFace<interface>/status<attribute>" data-link-for=FontFace data-link-type=attribute href=#dom-fontface-status title=status>status</a>;
 
-    // If the font face’s source is url-based and its status isn’t
-    // "loading" or "loaded", this kicks off the load.
-    void <a class=idl-code data-global-name="FontFace<interface>/load()<method>" data-link-for=FontFace data-link-type=method href=#dom-fontface-load title=load()>load</a>();
-
-    // Returns a promise that fulfills or rejects when the font face
-    // reached "loaded" or "error" status.
-    <a data-link-type=idl href=#dom-promise title=promise>Promise</a> <a class=idl-code data-global-name="FontFace<interface>/ready()<method>" data-link-for=FontFace data-link-type=method href=#dom-fontface-ready title=ready()>ready</a>();
+    <a data-link-type=idl href=#dom-promise title=promise>Promise</a> <a class=idl-code data-global-name="FontFace<interface>/load()<method>" data-link-for=FontFace data-link-type=method href=#dom-fontface-load title=load()>load</a>();
   };
 </pre>
 	<dl data-dfn-for=FontFace data-dfn-type=attribute>
@@ -288,7 +282,7 @@ <h3 class="heading settled heading" data-level=2.1 id=font-face-constructor><spa
 
 <p class=note>	Note: Note that constructing a <a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> object <strong>does not</strong> automatically add it to the document’s <a data-link-type=dfn href=#font-source title="font source">font source</a>.
 	If it’s desired that the newly-constructed <a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a> object is usable from CSS/etc,
-	it must be explicitly added to the <a data-link-type=dfn href=#font-source title="font source">font source</a>.
+	it must be explicitly added to a <a data-link-type=dfn href=#font-source title="font source">font source</a>.
 
 <h3 class="heading settled heading" data-level=2.2 id=font-face-load><span class=secno>2.2 </span><span class=content>
 The <code>load()</code> method</span><a class=self-link href=#font-face-load></a></h3>
@@ -309,13 +303,14 @@ <h3 class="heading settled heading" data-level=2.2 id=font-face-load><span class
 		<li>
 			If <var>font face’s</var> <a data-link-type=idl href=#dom-fontface-urls title=[urls]>[Urls]</a> attribute is <code>null</code>,
 			or its <a data-link-for=FontFace data-link-type=idl href=#dom-fontface-status title=status>status</a> attribute is anything other than <code>"unloaded"</code>,
-			abort this algorithm immediately.
+			return <var>font face’s</var> <a data-link-type=idl href=#dom-fontface-fontstatuspromise title=[fontstatuspromise]>[FontStatusPromise]</a>
+			and abort these steps.
 
 		<li>
 			Otherwise,
 			set <var>font face’s</var> <a data-link-for=FontFace data-link-type=idl href=#dom-fontface-status title=status>status</a> attribute to "loading",
-			return immediately,
-			and follow these steps asynchronously:
+			return <var>font face’s</var> <a data-link-type=idl href=#dom-fontface-fontstatuspromise title=[fontstatuspromise]>[FontStatusPromise]</a>,
+			and continue executing the rest of this algorithm asynchronously.
 
 		<li>
 			Using the value of <var>font face’s <a data-link-type=idl href=#dom-fontface-urls title=[urls]>[Urls]</a> attribute,