Changeset 112578 in webkit


Ignore:
Timestamp:
Mar 29, 2012 2:26:50 PM (12 years ago)
Author:
tony@chromium.org
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:
Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r112575 r112578  
     12012-03-29  Tony Chang  <tony@chromium.org>
     2
     3        remove ahem font from flexbox layout tests
     4        https://bugs.webkit.org/show_bug.cgi?id=82633
     5
     6        Reviewed by Ojan Vafai.
     7
     8        These tests don't depend on the ahem font and after r112489, we seem
     9        to be hitting a race condition on the Mac bots where we are checking
     10        baselines while the font is still being loaded. Speculatively fix by
     11        removing the webfont.
     12
     13        * css3/flexbox/flex-align-vertical-writing-mode.html:
     14        * css3/flexbox/flex-align.html:
     15
    1162012-03-29  Enrica Casucci  <enrica@apple.com>
    217

  • trunk/LayoutTests/css3/flexbox/flex-align-vertical-writing-mode.html

    r104625 r112578  
    3636.flexbox :nth-child(7) {
    3737    background-color: lime;
    38 }
    39 @font-face {
    40     font-family: test;
    41     src: url(../../resources/Ahem.ttf);
    4238}
    4339</style>
    … …  
    135131</div>
    136132
    137 <div class="flexbox" style="font-family: test;">
     133<div class="flexbox">
    138134  <div id="baseline1" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    139135  <div id="baseline2" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px;"></div>
    … …  
    143139</div>
    144140
    145 <div class="flexbox" style="font-family: test;">
     141<div class="flexbox">
    146142  <div id="baseline4" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    147143  <div id="baseline5" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px;"></div>
    … …  
    150146</div>
    151147
    152 <div class="flexbox" style="font-family: test; -webkit-writing-mode: vertical-lr">
     148<div class="flexbox" style="-webkit-writing-mode: vertical-lr">
    153149  <div id="baseline6" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    154150  <div id="baseline7" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px;"></div>
    … …  
    158154</div>
    159155
    160 <div class="flexbox" style="font-family: test; -webkit-writing-mode: vertical-lr">
     156<div class="flexbox" style="-webkit-writing-mode: vertical-lr">
    161157  <div id="baseline8" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    162158  <div id="baseline9" style="height: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px;"></div>

  • trunk/LayoutTests/css3/flexbox/flex-align.html

    r112154 r112578  
    3535.flexbox :nth-child(7) {
    3636    background-color: lime;
    37 }
    38 @font-face {
    39     font-family: test;
    40     src: url(../../resources/Ahem.ttf);
    4137}
    4238</style>
    … …  
    230226</div>
    231227
    232 <div class="flexbox" style="font-family: test;">
     228<div class="flexbox">
    233229  <div id="baseline1" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    234230  <div id="baseline2" data-offset-y="0" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><img src="../../fast/replaced/resources/1x1-blue.png" style="height: 50px;"></div>
    … …  
    238234</div>
    239235
    240 <div class="flexbox" style="font-family: test;">
     236<div class="flexbox">
    241237  <div id="baseline4" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;">ahem</div>
    242238  <div id="baseline5" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline;"><br><img src="../../fast/replaced/resources/1x1-blue.png" style="height: 50px;"></div>
Note: See TracChangeset for help on using the changeset viewer.