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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT Created 6 years, 5 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 | « LayoutTests/fast/css/getComputedStyle/computed-style-font-family-expected.txt ('k') | LayoutTests/fast/inspector-support/style-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
diff --git a/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
index cbcf4b1d5a99ae5b2ac10beeffdc3c35a705ab04..b092a74db82bd7e62765a3c2eb44a12e5d488232 100644
--- a/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
+++ b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
@@ -18,60 +18,60 @@ function computedFontCSSValue(fontString) {
return cssValue.cssText;
}
-shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
-shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
-shouldBe("computedFont('12px ahem')", "'normal normal normal 12px/normal ahem'");
-shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
-shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
-shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
-shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
-shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
-shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
-shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
-shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
-shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
-shouldBe("computedFont('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
-shouldBe("computedFont('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
-shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
+shouldBe("computedFont('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
+shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal normal 10px/normal sans-serif, sans-serif'");
+shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal normal 10px/normal sans-serif, serif'");
+shouldBe("computedFont('12px ahem')", "'normal normal normal normal 12px/normal ahem'");
+shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal normal 12px/normal unlikely-font-name'");
+shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 normal 10px/normal sans-serif'");
+shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 normal 10px/normal sans-serif'");
+shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 normal 10px/normal sans-serif'");
+shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 normal 10px/normal sans-serif'");
+shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 normal 10px/normal sans-serif'");
+shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
+shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
+shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 normal 10px/normal sans-serif'");
+shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 normal 10px/normal sans-serif'");
+shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px/100% sans-serif')", "'normal normal normal normal 10px/10px sans-serif'");
+shouldBe("computedFont('10px/100px sans-serif')", "'normal normal normal normal 10px/100px sans-serif'");
+shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
-shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal 12px/normal ahem'");
-shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
-shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
-shouldBe("computedFontCSSValue('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
-shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
+shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal normal 10px/normal sans-serif, sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal normal 10px/normal sans-serif, serif'");
+shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal normal 12px/normal ahem'");
+shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal normal 12px/normal unlikely-font-name'");
+shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px/100% sans-serif')", "'normal normal normal normal 10px/10px sans-serif'");
+shouldBe("computedFontCSSValue('10px/100px sans-serif')", "'normal normal normal normal 10px/100px sans-serif'");
+shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
« no previous file with comments | « LayoutTests/fast/css/getComputedStyle/computed-style-font-family-expected.txt ('k') | LayoutTests/fast/inspector-support/style-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698