Title: [112578] trunk/LayoutTests
- Revision
- 112578
- Author
- t...@chromium.org
- Date
- 2012-03-29 14:26:50 -0700 (Thu, 29 Mar 2012)
Log Message
remove ahem font from flexbox layout tests
https://bugs.webkit.org/show_bug.cgi?id=82633
Reviewed by Ojan Vafai.
These tests don't depend on the ahem font and after r112489, we seem
to be hitting a race condition on the Mac bots where we are checking
baselines while the font is still being loaded. Speculatively fix by
removing the webfont.
* css3/flexbox/flex-align-vertical-writing-mode.html:
* css3/flexbox/flex-align.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (112577 => 112578)
--- trunk/LayoutTests/ChangeLog 2012-03-29 21:24:24 UTC (rev 112577)
+++ trunk/LayoutTests/ChangeLog 2012-03-29 21:26:50 UTC (rev 112578)
@@ -1,3 +1,18 @@
+2012-03-29 Tony Chang <t...@chromium.org>
+
+ remove ahem font from flexbox layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=82633
+
+ Reviewed by Ojan Vafai.
+
+ These tests don't depend on the ahem font and after r112489, we seem
+ to be hitting a race condition on the Mac bots where we are checking
+ baselines while the font is still being loaded. Speculatively fix by
+ removing the webfont.
+
+ * css3/flexbox/flex-align-vertical-writing-mode.html:
+ * css3/flexbox/flex-align.html:
+
2012-03-29 Enrica Casucci <enr...@apple.com>
Moving test to skip from test-expectations.txt to Skipped
Modified: trunk/LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html (112577 => 112578)
--- trunk/LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html 2012-03-29 21:24:24 UTC (rev 112577)
+++ trunk/LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html 2012-03-29 21:26:50 UTC (rev 112578)
@@ -36,10 +36,6 @@
.flexbox :nth-child(7) {
background-color: lime;
}
-@font-face {
- font-family: test;
- src: url(../../resources/Ahem.ttf);
-}
</style>
<script>
if (window.layoutTestController)
@@ -134,7 +130,7 @@
<div data-expected-width="100" data-offset-x="0" style="height: -webkit-flex(1 0 0); width: 100px;"></div>
</div>
-<div class="flexbox" style="font-family: test;">
+<div class="flexbox">
<div id="baseline1" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline2" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="width: 50px;"></div>
<div data-expected-width="50" data-offset-x="25" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: center;"><img src="" style="width: 50px; vertical-align: middle"></div>
@@ -142,14 +138,14 @@
<div data-expected-width="100" data-offset-x="0" style="height: -webkit-flex(1 0 0); width: 100px;"></div>
</div>
-<div class="flexbox" style="font-family: test;">
+<div class="flexbox">
<div id="baseline4" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline5" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="" style="width: 50px;"></div>
<div data-expected-width="50" data-offset-x="50" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="width: 50px; vertical-align: middle"></div>
<div data-expected-width="100" data-offset-x="0" style="height: -webkit-flex(1 0 0); width: 100px;"></div>
</div>
-<div class="flexbox" style="font-family: test; -webkit-writing-mode: vertical-lr">
+<div class="flexbox" style="-webkit-writing-mode: vertical-lr">
<div id="baseline6" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline7" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="width: 50px;"></div>
<div data-expected-width="50" data-offset-x="25" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: center;"><img src="" style="width: 50px; vertical-align: middle"></div>
@@ -157,7 +153,7 @@
<div data-expected-width="100" data-offset-x="0" style="height: -webkit-flex(1 0 0); width: 100px;"></div>
</div>
-<div class="flexbox" style="font-family: test; -webkit-writing-mode: vertical-lr">
+<div class="flexbox" style="-webkit-writing-mode: vertical-lr">
<div id="baseline8" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline9" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="" style="width: 50px;"></div>
<div data-expected-width="50" data-offset-x="0" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="width: 50px; vertical-align: middle"></div>
Modified: trunk/LayoutTests/css3/flexbox/flex-align.html (112577 => 112578)
--- trunk/LayoutTests/css3/flexbox/flex-align.html 2012-03-29 21:24:24 UTC (rev 112577)
+++ trunk/LayoutTests/css3/flexbox/flex-align.html 2012-03-29 21:26:50 UTC (rev 112578)
@@ -35,10 +35,6 @@
.flexbox :nth-child(7) {
background-color: lime;
}
-@font-face {
- font-family: test;
- src: url(../../resources/Ahem.ttf);
-}
</style>
<script>
if (window.layoutTestController)
@@ -229,7 +225,7 @@
<div data-expected-height="20" data-offset-y="0" style="width: -webkit-flex(1 0 0);"></div>
</div>
-<div class="flexbox" style="font-family: test;">
+<div class="flexbox">
<div id="baseline1" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline2" data-offset-y="0" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="height: 50px;"></div>
<div data-expected-height="50" data-offset-y="25" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: center;"><img src="" style="height: 50px; vertical-align: middle"></div>
@@ -237,7 +233,7 @@
<div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div>
</div>
-<div class="flexbox" style="font-family: test;">
+<div class="flexbox">
<div id="baseline4" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
<div id="baseline5" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="" style="height: 50px;"></div>
<div data-expected-height="50" data-offset-y="0" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="" style="height: 50px; vertical-align: middle"></div>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
