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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1820773002: getComputedStyle() should return used value for 'line-height' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/getComputedStyle/computed-style-without-renderer-listing-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/events/ondrop-text-html-expected.txt » ('j') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
diff --git a/third_party/WebKit/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js b/third_party/WebKit/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
index f4e139a7db685503e5c9740c4cd99943cf913113..148db5a6b759a3d9c396d24d59a45015f27b9138 100644
--- a/third_party/WebKit/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
+++ b/third_party/WebKit/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
@@ -9,31 +9,31 @@ function computedFont(fontString) {
return window.getComputedStyle(testDiv).getPropertyValue('font');
}
-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 sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('10px sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('12px sans-serif')", "'normal normal normal normal 12px / 15px sans-serif'");
+shouldBe("computedFont('12px sans-serif')", "'normal normal normal normal 12px / 15px sans-serif'");
+shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal normal 10px / 13px sans-serif, sans-serif'");
+shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal normal 10px / 13px sans-serif, serif'");
+shouldBe("computedFont('12px ahem')", "'normal normal normal normal 12px / 12px ahem'");
+shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal normal 12px / 16px unlikely-font-name'");
+shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 normal 10px / 13px sans-serif'");
+shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 normal 10px / 13px sans-serif'");
+shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 normal 10px / 13px sans-serif'");
+shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 normal 10px / 13px sans-serif'");
+shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 normal 10px / 12px sans-serif'");
+shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold normal 10px / 12px sans-serif'");
+shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold normal 10px / 12px sans-serif'");
+shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 normal 10px / 12px sans-serif'");
+shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 normal 10px / 12px sans-serif'");
+shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold normal 10px / 11px 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("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
+shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px / 13px sans-serif'");
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-listing-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/events/ondrop-text-html-expected.txt » ('j') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698