Index: third_party/WebKit/LayoutTests/fast/css/fontface-properties.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css/fontface-properties.html b/third_party/WebKit/LayoutTests/fast/css/fontface-properties.html |
index 66ca02c9cac0fb9c46a09f31d11ce2679e12895f..11976f0ba3846d4db666d04a29dafb1c6a9de55b 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css/fontface-properties.html |
+++ b/third_party/WebKit/LayoutTests/fast/css/fontface-properties.html |
@@ -10,6 +10,7 @@ |
unicode-range: U+0-3FF; |
font-variant: small-caps; |
-webkit-font-feature-settings: "dlig" 1; |
+ font-display: block; |
/* font-stretch property is not supported */ |
} |
</style> |
@@ -31,6 +32,7 @@ function runTests() { |
shouldBeEqualToString('ahemFace.unicodeRange', 'U+0-3FF'); |
shouldBeEqualToString('ahemFace.variant', 'small-caps'); |
shouldBeEqualToString('ahemFace.featureSettings', "'dlig' 1"); |
+ shouldBeEqualToString('ahemFace.display', 'block'); |
debug(''); |
defaultFace = new FontFace('defaultFace', 'local(foo)'); |
@@ -41,6 +43,7 @@ function runTests() { |
shouldBeEqualToString('defaultFace.unicodeRange', 'U+0-10FFFF'); |
shouldBeEqualToString('defaultFace.variant', 'normal'); |
shouldBeEqualToString('defaultFace.featureSettings', 'normal'); |
+ shouldBeEqualToString('defaultFace.display', 'auto'); |
debug(''); |
constructedFace = new FontFace('constructedFace', 'local(bar)', { |
@@ -48,7 +51,8 @@ function runTests() { |
'weight': 'bold', |
'unicodeRange': 'U+100-1FF, U+ABCD', |
'variant': 'small-caps', |
- 'featureSettings': "'liga' 0" |
+ 'featureSettings': "'liga' 0", |
+ 'display': 'optional' |
}); |
shouldBeEqualToString('constructedFace.family', 'constructedFace'); |
shouldBeEqualToString('constructedFace.style', 'oblique'); |
@@ -56,6 +60,7 @@ function runTests() { |
shouldBeEqualToString('constructedFace.unicodeRange', 'U+100-1FF, U+ABCD'); |
shouldBeEqualToString('constructedFace.variant', 'small-caps'); |
shouldBeEqualToString('constructedFace.featureSettings', "'liga' 0"); |
+ shouldBeEqualToString('constructedFace.display', 'optional'); |
debug(''); |
modifiedFace = new FontFace('unmodified', 'local(baz)'); |
@@ -65,12 +70,14 @@ function runTests() { |
modifiedFace.unicodeRange = 'U+0-3FF'; |
modifiedFace.variant = 'small-caps'; |
modifiedFace.featureSettings = "'dlig' 1, 'liga' 0"; |
+ modifiedFace.display = 'fallback'; |
shouldBeEqualToString('modifiedFace.family', 'modified'); |
shouldBeEqualToString('modifiedFace.style', 'italic'); |
shouldBeEqualToString('modifiedFace.weight', '900'); |
shouldBeEqualToString('modifiedFace.unicodeRange', 'U+0-3FF'); |
shouldBeEqualToString('modifiedFace.variant', 'small-caps'); |
shouldBeEqualToString('modifiedFace.featureSettings', "'dlig' 1, 'liga' 0"); |
+ shouldBeEqualToString('modifiedFace.display', 'fallback'); |
debug(''); |
face = new FontFace('test', 'local(foo)'); |
@@ -79,6 +86,7 @@ function runTests() { |
shouldThrow("face.unicodeRange = 'U+'"); |
shouldThrow("face.variant = '???'"); |
shouldThrow("face.featureSettings = null"); |
+ shouldThrow("face.display = 123"); |
promise1 = face.loaded; |
promise2 = face.load(); |
promise3 = face.loaded; |