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

Unified Diff: third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html

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, 8 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
Index: third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html
diff --git a/third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html b/third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html
index 92c584df0822a9effed033345fa18d595739dc2e..276f9b6564c098c477cf1ab4e2b5cfe982f07ab8 100644
--- a/third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html
+++ b/third_party/WebKit/LayoutTests/fast/css/font-shorthand-from-longhands.html
@@ -34,31 +34,33 @@ function checkFontStyleValue() {
}
style.fontSize = "20px";
+style.lineHeight = "20px";
// We need all font longhands to build the shorthand.
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal normal normal 20px / normal foobar'");
+shouldBe("computedStyle.font", "'normal normal normal normal 20px / 20px foobar'");
shouldBe("computedStyle.fontSize", "'20px'");
shouldBe("checkFontStyleValue()", "true");
style.fontSize = "20px";
+style.lineHeight = "20px";
style.fontFamily = "sans-serif";
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal normal normal 20px / normal sans-serif'");
+shouldBe("computedStyle.font", "'normal normal normal normal 20px / 20px sans-serif'");
shouldBe("computedStyle.fontFamily", "'sans-serif'");
style.fontStyle = "italic";
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'italic normal normal normal 20px / normal sans-serif'");
+shouldBe("computedStyle.font", "'italic normal normal normal 20px / 20px sans-serif'");
shouldBe("computedStyle.fontStyle", "'italic'");
style.fontVariant = "small-caps";
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'italic small-caps normal normal 20px / normal sans-serif'");
+shouldBe("computedStyle.font", "'italic small-caps normal normal 20px / 20px sans-serif'");
shouldBe("computedStyle.fontVariant", "'small-caps'");
style.fontWeight = "bold";
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'italic small-caps bold normal 20px / normal sans-serif'");
+shouldBe("computedStyle.font", "'italic small-caps bold normal 20px / 20px sans-serif'");
shouldBe("computedStyle.fontWeight", "'bold'");
style.lineHeight = "40px";
@@ -74,7 +76,7 @@ shouldBe("checkFontStyleValue()", "true");
style.font = "";
shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal normal normal 16px / normal foobar'");
+shouldBe("computedStyle.font", "'normal normal normal normal 16px / 20px foobar'");
shouldBe("checkFontStyleValue()", "true");
document.body.removeChild(testContainer);

Powered by Google App Engine
This is Rietveld 408576698