Title: [178976] trunk/LayoutTests
- Revision
- 178976
- Author
- cdu...@apple.com
- Date
- 2015-01-22 18:17:32 -0800 (Thu, 22 Jan 2015)
Log Message
Import fast/css/font-shorthand-line-height.html layout test from Blink
https://bugs.webkit.org/show_bug.cgi?id=140801
Reviewed by Andreas Kling.
Import fast/css/font-shorthand-line-height.html layout test from Blink
to get better test coverage for 'line-height' font shorthands cascades:
https://src.chromium.org/viewvc/blink?view=rev&revision=184346
I am working on expanding the font shorthand at parsing time (like
other shorthands) via Bug 140577 and I want to make sure I don't break
line-height in the process.
* fast/css/font-shorthand-line-height-expected.txt: Added.
* fast/css/font-shorthand-line-height.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (178975 => 178976)
--- trunk/LayoutTests/ChangeLog 2015-01-23 01:57:31 UTC (rev 178975)
+++ trunk/LayoutTests/ChangeLog 2015-01-23 02:17:32 UTC (rev 178976)
@@ -1,3 +1,21 @@
+2015-01-22 Chris Dumez <cdu...@apple.com>
+
+ Import fast/css/font-shorthand-line-height.html layout test from Blink
+ https://bugs.webkit.org/show_bug.cgi?id=140801
+
+ Reviewed by Andreas Kling.
+
+ Import fast/css/font-shorthand-line-height.html layout test from Blink
+ to get better test coverage for 'line-height' font shorthands cascades:
+ https://src.chromium.org/viewvc/blink?view=rev&revision=184346
+
+ I am working on expanding the font shorthand at parsing time (like
+ other shorthands) via Bug 140577 and I want to make sure I don't break
+ line-height in the process.
+
+ * fast/css/font-shorthand-line-height-expected.txt: Added.
+ * fast/css/font-shorthand-line-height.html: Added.
+
2015-01-22 Michael Saboff <msab...@apple.com>
REGRESSION (174847): can't view NHK(Japan's national public broadcasting organization)’s news pages
Added: trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt (0 => 178976)
--- trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt 2015-01-23 02:17:32 UTC (rev 178976)
@@ -0,0 +1,15 @@
+Test that line-height in font shorthands cascades correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS lineHeight(system_font_1) is '100px'
+PASS lineHeight(system_font_2) is '100px'
+PASS lineHeight(shorthand_normal_1) is '100px'
+PASS lineHeight(shorthand_normal_2) is 'normal'
+PASS lineHeight(shorthand_line_height_1) is '100px'
+PASS lineHeight(shorthand_line_height_2) is '200px'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/css/font-shorthand-line-height.html (0 => 178976)
--- trunk/LayoutTests/fast/css/font-shorthand-line-height.html (rev 0)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height.html 2015-01-23 02:17:32 UTC (rev 178976)
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<script src=""
+<style>
+ #system_font_1 { font: caption; line-height: 100px; }
+ #system_font_2 { line-height: 100px; font: caption; }
+
+ #shorthand_normal_1 { font: 10px monospace; line-height: 100px; }
+ #shorthand_normal_2 { line-height: 100px; font: 10px monospace; }
+
+ #shorthand_line_height_1 { font: 10px/200px monospace; line-height: 100px; }
+ #shorthand_line_height_2 { line-height: 100px; font: 10px/200px monospace; }
+</style>
+<div id="system_font_1"></div>
+<div id="system_font_2"></div>
+<div id="shorthand_normal_1"></div>
+<div id="shorthand_normal_2"></div>
+<div id="shorthand_line_height_1"></div>
+<div id="shorthand_line_height_2"></div>
+<script>
+ description("Test that line-height in font shorthands cascades correctly.");
+
+ function lineHeight(target) {
+ return getComputedStyle(target).lineHeight;
+ }
+
+ shouldBe("lineHeight(system_font_1)", "'100px'");
+ shouldBe("lineHeight(system_font_2)", "'100px'");
+ shouldBe("lineHeight(shorthand_normal_1)", "'100px'");
+ shouldBe("lineHeight(shorthand_normal_2)", "'normal'");
+ shouldBe("lineHeight(shorthand_line_height_1)", "'100px'");
+ shouldBe("lineHeight(shorthand_line_height_2)", "'200px'");
+</script>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
