| Index: third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove.html b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove.html
|
| index 4c9ae56d60573080ffdffa1c5e28629d5592d93e..63d74f3adbdcf814d18b96c844e3b758e3720f70 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-add-remove.html
|
| @@ -1,6 +1,6 @@
|
| -<html>
|
| -<head>
|
| -<script src="../../resources/js-test.js"></script>
|
| +<script src='../../resources/testharness.js'></script>
|
| +<script src='../../resources/testharnessreport.js'></script>
|
| +
|
| <style>
|
| @font-face {
|
| font-family: TestFont;
|
| @@ -21,38 +21,36 @@
|
| }
|
| </style>
|
| <script>
|
| -description('Tests that adding/removing a FontFace to/from FontFaceSet trigger font update.');
|
|
|
| -window.jsTestIsAsync = true;
|
| +promise_test(() => {
|
| + let ahemFace = new FontFace('TestFont', 'url(../../resources/Ahem.ttf)', {});
|
| + assert_equals(ahemFace.status, 'unloaded');
|
|
|
| -function runTest() {
|
| - ahemFace = new FontFace('TestFont', 'url(../../resources/Ahem.ttf)', {});
|
| - ahemFace.load().then(verify);
|
| -}
|
| + return ahemFace.load().then(() => {
|
| + let testElement = document.getElementById('test');
|
| + let arialElement = document.getElementById('arial');
|
| + let ahemElement = document.getElementById('ahem');
|
|
|
| -function verify() {
|
| - testElement = document.getElementById('test');
|
| - arialElement = document.getElementById('arial');
|
| - ahemElement = document.getElementById('ahem');
|
| + assert_equals(testElement.offsetWidth, arialElement.offsetWidth);
|
|
|
| - shouldBe('testElement.offsetWidth', 'arialElement.offsetWidth');
|
| addResult = document.fonts.add(ahemFace);
|
| - shouldBeTrue('addResult === document.fonts');
|
| - shouldBe('testElement.offsetWidth', 'ahemElement.offsetWidth');
|
| + assert_equals(addResult, document.fonts);
|
| + assert_equals(testElement.offsetWidth, ahemElement.offsetWidth);
|
| +
|
| document.fonts.delete(ahemFace);
|
| - shouldBe('testElement.offsetWidth', 'arialElement.offsetWidth');
|
| + assert_equals(testElement.offsetWidth, arialElement.offsetWidth);
|
| +
|
| document.fonts.add(ahemFace);
|
| - shouldBe('testElement.offsetWidth', 'ahemElement.offsetWidth');
|
| + assert_equals(testElement.offsetWidth, ahemElement.offsetWidth);
|
| +
|
| document.fonts.clear();
|
| - shouldBe('testElement.offsetWidth', 'arialElement.offsetWidth');
|
| + assert_equals(testElement.offsetWidth, arialElement.offsetWidth);
|
| + });
|
| +}, 'Tests that adding/removing a FontFace to/from a FontFaceSet triggers a ' +
|
| + 'font update');
|
|
|
| - finishJSTest();
|
| -}
|
| </script>
|
| -</head>
|
| -<body onload="runTest()">
|
| +
|
| <br><span id="test">abcdefg</span>
|
| <br><span id="arial">abcdefg</span>
|
| <br><span id="ahem">abcdefg</span>
|
| -</body>
|
| -</html>
|
|
|
Chromium Code Reviews
Issue 2629543004:
Convert some fontfaceset tests to use jsharness (Closed)
