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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html

Issue 2629543004: Convert some fontfaceset tests to use jsharness (Closed)
Patch Set: Fix minor formatting issue Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html
diff --git a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html
index 3c63e88fd7e9849edfa70d3e8a07edada8072ed7..8cbf6511dc28517f45e58cb461c9b770b7507022 100644
--- a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html
+++ b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading.html
@@ -1,69 +1,83 @@
<!DOCTYPE html>
-<script src="../../resources/js-test.js"></script>
-<script>
-description('Tests that FontFaceSet is correctly updated when added or removed a FontFace while loading.');
+<script src='../../resources/testharness.js'></script>
+<script src='../../resources/testharnessreport.js'></script>
-window.jsTestIsAsync = true;
+<script>
function loadingDonePromise() {
- return new Promise(function(resolve) {
- function handler(e) {
- document.fonts.removeEventListener('loadingdone', handler);
- resolve(e);
- };
- document.fonts.addEventListener('loadingdone', handler);
- });
+ return new Promise(function(resolve) {
+ function handler(e) {
+ document.fonts.removeEventListener('loadingdone', handler);
+ resolve(e);
+ };
+ document.fonts.addEventListener('loadingdone', handler);
+ });
}
-Promise.resolve().then(function() {
- face1 = new FontFace('face1', 'url(../../resources/Ahem.ttf)', {});
- shouldBeEqualToString('face1.status', 'unloaded');
-
- face1.load();
- shouldBeEqualToString('face1.status', 'loading');
- shouldBeEqualToString('document.fonts.status', 'loaded');
-
- document.fonts.add(face1);
- shouldBeEqualToString('document.fonts.status', 'loading');
- return document.fonts.ready;
-}).then(function() {
- shouldBeEqualToString('face1.status', 'loaded');
- shouldBeEqualToString('document.fonts.status', 'loaded');
-
- face2 = new FontFace('face2', 'url(../../resources/Ahem.ttf)', {});
- shouldBeEqualToString('face2.status', 'unloaded');
-
- document.fonts.add(face2);
- var face2loaded = face2.load()
- shouldBeEqualToString('document.fonts.status', 'loading');
-
- var loadingdone = loadingDonePromise();
- document.fonts.delete(face2);
- shouldBeEqualToString('document.fonts.status', 'loading');
- shouldBeEqualToString('face2.status', 'loading');
-
- return Promise.all([face2loaded, loadingdone]);
-}).then(function() {
- shouldBeEqualToString('face2.status', 'loaded');
- shouldBeEqualToString('document.fonts.status', 'loaded');
-
- face3 = new FontFace('face3', 'url(../../resources/Ahem.ttf)', {});
- shouldBeEqualToString('face3.status', 'unloaded');
-
- document.fonts.add(face3);
- face3.load();
- shouldBeEqualToString('document.fonts.status', 'loading');
-
- document.fonts.clear();
- shouldBeEqualToString('document.fonts.status', 'loading');
- shouldBeEqualToString('face3.status', 'loading');
- return document.fonts.ready;
-}).then(function() {
- shouldBeEqualToString('document.fonts.status', 'loaded');
- finishJSTest();
-}).catch(function (err) {
- testFailed('Unexpected rejection: ' + err);
- finishJSTest();
-});
+promise_test(() => {
+ let face = new FontFace('face1', 'url(../../resources/Ahem.ttf)', {});
+ assert_equals(face.status, 'unloaded');
+
+ let faceLoaded = face.load();
+ assert_equals(face.status, 'loading');
+ assert_equals(document.fonts.status, 'loaded')
+
+ let loadingDone = loadingDonePromise();
+ document.fonts.add(face);
+ assert_equals(document.fonts.status, 'loading');
+
+ return Promise.all(
+ [faceLoaded, loadingDone, document.fonts.ready]).then(() => {
+ assert_equals(document.fonts.status, 'loaded');
+ assert_equals(face.status, 'loaded');
+ });
+}, 'document.fonts.add() called while a FontFace is loading.');
+
+promise_test(() => {
+ assert_equals(document.fonts.status, 'loaded');
+
+ let face = new FontFace('face2', 'url(../../resources/Ahem.ttf)', {});
+ assert_equals(face.status, 'unloaded');
+
+ document.fonts.add(face);
+ let faceLoaded = face.load();
+ assert_equals(document.fonts.status, 'loading');
+
+ let loadingDone = loadingDonePromise();
+ document.fonts.delete(face);
+
+ // Deleting a font from the document should not change its or the document's
+ // loading status until the loadingdone event is fired.
+ assert_equals(document.fonts.status, 'loading');
+ assert_equals(face.status, 'loading');
+
+ return Promise.all(
+ [faceLoaded, loadingDone, document.fonts.ready]).then(() => {
+ assert_equals(document.fonts.status, 'loaded');
+ assert_equals(face.status, 'loaded');
+ });
+}, 'document.fonts.delete() called while a FontFace is loading.');
+
+promise_test(() => {
+ assert_equals(document.fonts.status, 'loaded');
+
+ let face = new FontFace('face3', 'url(../../resources/Ahem.ttf)', {});
+ assert_equals(face.status, 'unloaded');
+
+ document.fonts.add(face);
+ let faceLoaded = face.load();
+ assert_equals(document.fonts.status, 'loading');
+
+ let loadingDone = loadingDonePromise();
+ document.fonts.clear();
+ assert_equals(document.fonts.status, 'loading');
+ assert_equals(face.status, 'loading');
+
+ return Promise.all(
+ [faceLoaded, loadingDone, document.fonts.ready]).then(() => {
+ assert_equals(document.fonts.status, 'loaded');
+ assert_equals(face.status, 'loaded');
+ });
+}, 'document.fonts.clear() called while a FontFace is loading.');
</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove-while-loading-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698