Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: sky/engine/core/css/FontFace.idl

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/engine/core/css/FontFace.cpp ('k') | sky/engine/core/css/FontFaceSet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 32
33 enum FontFaceLoadStatus { 33 enum FontFaceLoadStatus {
34 "unloaded", 34 "unloaded",
35 "loading", 35 "loading",
36 "loaded", 36 "loaded",
37 "error" 37 "error"
38 }; 38 };
39 39
40 [ 40 [
41 // FIXME: should be union type http://crbug.com/240176 41 // FIXME: should be union type http://crbug.com/240176
42 Constructor(DOMString family, DOMString source, optional Dictionary descript ors), 42 // FIXME(Dictionary): descriptors
43 Constructor(DOMString family, ArrayBuffer source, optional Dictionary descri ptors), 43 Constructor(DOMString family, DOMString source),
44 Constructor(DOMString family, ArrayBufferView source, optional Dictionary de scriptors),
45 ConstructorCallWith=ExecutionContext, 44 ConstructorCallWith=ExecutionContext,
46 ] interface FontFace { 45 ] interface FontFace {
47 46
48 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g family; 47 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g family;
49 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g style; 48 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g style;
50 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g weight; 49 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g weight;
51 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g stretch; 50 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g stretch;
52 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g unicodeRange; 51 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g unicodeRange;
53 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g variant; 52 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g variant;
54 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g featureSettings; 53 [RaisesException=Setter, SetterCallWith=ExecutionContext] attribute DOMStrin g featureSettings;
55 54
56 readonly attribute FontFaceLoadStatus status; 55 readonly attribute FontFaceLoadStatus status;
57 [CallWith=ScriptState] readonly attribute Promise loaded;
58
59 [CallWith=ScriptState] Promise load();
60 }; 56 };
OLDNEW
« no previous file with comments | « sky/engine/core/css/FontFace.cpp ('k') | sky/engine/core/css/FontFaceSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698