Index: core/css/FontFace.idl |
diff --git a/core/css/FontFace.idl b/core/css/FontFace.idl |
index d83c666b895521d146ba440d5c6622e89552a0d3..37e45c44d39a9f48b7555e1cb112e77d69cc267c 100644 |
--- a/core/css/FontFace.idl |
+++ b/core/css/FontFace.idl |
@@ -28,7 +28,7 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-// http://dev.w3.org/csswg/css-font-loading/#dom-fontface |
+// http://dev.w3.org/csswg/css-font-loading/#fontface-interface |
enum FontFaceLoadStatus { |
"unloaded", |
@@ -37,16 +37,14 @@ enum FontFaceLoadStatus { |
"error" |
}; |
+// TODO(philipj): This interface should be [Exposed=Window,Worker]. |
[ |
ActiveDOMObject, |
- // FIXME: should be union type http://crbug.com/240176 |
- Constructor(DOMString family, DOMString source, optional FontFaceDescriptors descriptors), |
- Constructor(DOMString family, ArrayBuffer source, optional FontFaceDescriptors descriptors), |
- Constructor(DOMString family, ArrayBufferView source, optional FontFaceDescriptors descriptors), |
+ // FIXME: This should be (DOMString or BinaryData), where BinaryData is typedef of (ArrayBuffer or ArrayBufferView) |
+ Constructor(DOMString family, (DOMString or ArrayBuffer or ArrayBufferView) source, optional FontFaceDescriptors descriptors), |
ConstructorCallWith=ExecutionContext, |
WillBeGarbageCollected, |
] interface FontFace { |
- |
[RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMString family; |
[RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMString style; |
[RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMString weight; |
@@ -56,7 +54,7 @@ enum FontFaceLoadStatus { |
[RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMString featureSettings; |
readonly attribute FontFaceLoadStatus status; |
- [CallWith=ScriptState] readonly attribute Promise loaded; |
- [CallWith=ScriptState] Promise load(); |
+ [CallWith=ScriptState] Promise<FontFace> load(); |
+ [CallWith=ScriptState] readonly attribute Promise<FontFace> loaded; |
}; |