Title: [179174] trunk/LayoutTests
- Revision
- 179174
- Author
- [email protected]
- Date
- 2015-01-26 23:40:39 -0800 (Mon, 26 Jan 2015)
Log Message
Unreviewed, rebaseline several CSS tests after r179168.
Computed line-height is no longer 'normal' but the font's line
spacing.
* fast/css/font-shorthand-line-height-expected.txt:
* fast/css/font-shorthand-line-height.html:
* platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt:
* platform/mac/fast/css/css2-system-fonts-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (179173 => 179174)
--- trunk/LayoutTests/ChangeLog 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/ChangeLog 2015-01-27 07:40:39 UTC (rev 179174)
@@ -1,3 +1,15 @@
+2015-01-26 Chris Dumez <[email protected]>
+
+ Unreviewed, rebaseline several CSS tests after r179168.
+
+ Computed line-height is no longer 'normal' but the font's line
+ spacing.
+
+ * fast/css/font-shorthand-line-height-expected.txt:
+ * fast/css/font-shorthand-line-height.html:
+ * platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt:
+ * platform/mac/fast/css/css2-system-fonts-expected.txt:
+
2015-01-26 Brent Fulgham <[email protected]>
[Win] Unskipping more tests after correcting baselines for Windows widgets.
Modified: trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt (179173 => 179174)
--- trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
@@ -4,9 +4,9 @@
PASS lineHeight(system_font_1) is '100px'
-PASS lineHeight(system_font_2) is 'normal'
+PASS lineHeight(system_font_2) is '16px'
PASS lineHeight(shorthand_normal_1) is '100px'
-PASS lineHeight(shorthand_normal_2) is 'normal'
+PASS lineHeight(shorthand_normal_2) is '12px'
PASS lineHeight(shorthand_line_height_1) is '100px'
PASS lineHeight(shorthand_line_height_2) is '200px'
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/css/font-shorthand-line-height.html (179173 => 179174)
--- trunk/LayoutTests/fast/css/font-shorthand-line-height.html 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height.html 2015-01-27 07:40:39 UTC (rev 179174)
@@ -24,9 +24,9 @@
}
shouldBe("lineHeight(system_font_1)", "'100px'");
- shouldBe("lineHeight(system_font_2)", "'normal'");
+ shouldBe("lineHeight(system_font_2)", "'16px'");
shouldBe("lineHeight(shorthand_normal_1)", "'100px'");
- shouldBe("lineHeight(shorthand_normal_2)", "'normal'");
+ shouldBe("lineHeight(shorthand_normal_2)", "'12px'");
shouldBe("lineHeight(shorthand_line_height_1)", "'100px'");
shouldBe("lineHeight(shorthand_line_height_2)", "'200px'");
</script>
Modified: trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt (179173 => 179174)
--- trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
@@ -1,10 +1,10 @@
This tests platform specific system font styles. If any of the styles appear in monospace the test fails.
-caption: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-icon: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-menu: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-message-box: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-small-caption: normal normal normal 11px/normal '.HelveticaNeueDeskInterface-Regular'
-status-bar: normal normal normal 10px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-mini-control: normal normal normal 9px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-small-control: normal normal normal 11px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-control: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
+caption: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+icon: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+menu: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+message-box: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+small-caption: normal normal normal 11px/13px '.HelveticaNeueDeskInterface-Regular'
+status-bar: normal normal normal 10px/12px '.HelveticaNeueDeskInterface-Regular'
+-webkit-mini-control: normal normal normal 9px/11px '.HelveticaNeueDeskInterface-Regular'
+-webkit-small-control: normal normal normal 11px/13px '.HelveticaNeueDeskInterface-Regular'
+-webkit-control: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
Modified: trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt (179173 => 179174)
--- trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
@@ -1,10 +1,10 @@
This tests platform specific system font styles. If any of the styles appear in monospace the test fails.
-caption: normal normal normal 13px/normal '.LucidaGrandeUI'
-icon: normal normal normal 13px/normal '.LucidaGrandeUI'
-menu: normal normal normal 13px/normal '.LucidaGrandeUI'
-message-box: normal normal normal 13px/normal '.LucidaGrandeUI'
-small-caption: normal normal normal 11px/normal '.LucidaGrandeUI'
-status-bar: normal normal normal 10px/normal '.LucidaGrandeUI'
--webkit-mini-control: normal normal normal 9px/normal '.LucidaGrandeUI'
--webkit-small-control: normal normal normal 11px/normal '.LucidaGrandeUI'
--webkit-control: normal normal normal 13px/normal '.LucidaGrandeUI'
+caption: normal normal normal 13px/16px '.LucidaGrandeUI'
+icon: normal normal normal 13px/16px '.LucidaGrandeUI'
+menu: normal normal normal 13px/16px '.LucidaGrandeUI'
+message-box: normal normal normal 13px/16px '.LucidaGrandeUI'
+small-caption: normal normal normal 11px/13px '.LucidaGrandeUI'
+status-bar: normal normal normal 10px/12px '.LucidaGrandeUI'
+-webkit-mini-control: normal normal normal 9px/11px '.LucidaGrandeUI'
+-webkit-small-control: normal normal normal 11px/13px '.LucidaGrandeUI'
+-webkit-control: normal normal normal 13px/16px '.LucidaGrandeUI'
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
