Changeset 63635 in webkit


Ignore:
Timestamp:
Jul 18, 2010 3:25:56 PM (14 years ago)
Author:
dino@apple.com
Message:

2010-07-18 Dean Jackson <​dino@apple.com>

Unreviewed (although this was discussed with SimonF in
original review).

​https://bugs.webkit.org/show_bug.cgi?id=41259

Unfortunately the test in the previous commit is platform
specific (I was hoping it would not be) and is failing
the bots. This update exercises the same thing, but doesn't
check for exact values.

  • fast/transforms/scrollIntoView-transformed-expected.txt:
  • fast/transforms/scrollIntoView-transformed.html:
Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r63633 r63635  
     12010-07-18  Dean Jackson  <dino@apple.com>
     2
     3        Unreviewed (although this was discussed with SimonF in
     4        original review).
     5
     6        https://bugs.webkit.org/show_bug.cgi?id=41259
     7
     8        Unfortunately the test in the previous commit is platform
     9        specific (I was hoping it would not be) and is failing
     10        the bots. This update exercises the same thing, but doesn't
     11        check for exact values.
     12
     13        * fast/transforms/scrollIntoView-transformed-expected.txt:
     14        * fast/transforms/scrollIntoView-transformed.html:
     15
    1162010-07-18  Dean Jackson  <dino@apple.com>
    217

  • trunk/LayoutTests/fast/transforms/scrollIntoView-transformed-expected.txt

    r63633 r63635  
    6666
    6767this is a div scroll trigger with a transform
    68 PASS - Element a had scrollTop: 224
     68PASS - Element a and Element b had different scrollTop
    6969PASS - Element b had scrollTop: 0
    70 PASS - Element c had scrollTop: 233
    71 PASS - Element d had scrollTop: 233
    72 PASS - Element e had scrollTop: 221
    73 PASS - Element f had scrollTop: 221
    74 PASS - Element g had scrollTop: 238
    75 PASS - Element h had scrollTop: 238
    76 PASS - Element i had scrollTop: 255
    77 PASS - Element j had scrollTop: 255
     70PASS - Element c and Element c-transformed both had the same scrollTop
     71PASS - Element d and Element d-transformed both had the same scrollTop
     72PASS - Element e and Element e-transformed both had the same scrollTop
     73PASS - Element f and Element f-transformed both had the same scrollTop
    7874

  • trunk/LayoutTests/fast/transforms/scrollIntoView-transformed.html

    r63633 r63635  
    22<script>
    33
    4 const expectedValues = [
    5   ["a", 224],
    6   ["b", 0],
    7   ["c", 233],
    8   ["d", 233],
    9   ["e", 221],
    10   ["f", 221],
    11   ["g", 238],
    12   ["h", 238],
    13   ["i", 255],
    14   ["j", 255]
     4const sameValues = [
     5  ["c", "c-transformed"],
     6  ["d", "d-transformed"],
     7  ["e", "e-transformed"],
     8  ["f", "f-transformed"]
    159];
     10
    1611
    1712function test()
    … …  
    3328
    3429    var resultString = "";
    35     for (i=0; i < expectedValues.length; i++) {
    36       var id = expectedValues[i][0];
    37       var expectedScrollTop = expectedValues[i][1];
    38       var element = document.getElementById(id);
    39       var currentScrollTop = element.scrollTop;
    40       if (expectedScrollTop != currentScrollTop) {
    41         resultString += "FAIL - Element " + id + " had scrollTop: " + currentScrollTop + " should be " + expectedScrollTop + "<br>";
     30    var id1, id2, element1, element2, scrollTop1, scrollTop2;
     31   
     32    // The test results should be (for scrollTop)
     33    // a != b
     34    // b == 0
     35    // c == c-transformed
     36    // d == c-transformed
     37    // e == c-transformed
     38    // f == c-transformed
     39
     40    id1 = "a";
     41    id2 = "b";
     42    element1 = document.getElementById(id1);
     43    element2 = document.getElementById(id2);
     44    scrollTop1 = element1.scrollTop;
     45    scrollTop2 = element2.scrollTop;
     46    if (scrollTop1 != scrollTop2) {
     47      resultString += "PASS - Element " + id1 + " and Element " + id2 + " had different scrollTop<br>";
     48    } else {
     49      resultString += "FAIL - Element " + id1 + " and Element " + id2 + " had identical scrollTop<br>";
     50    }
     51
     52    if (scrollTop2 == 0) {
     53      resultString += "PASS - Element " + id2 + " had scrollTop: 0<br>";
     54    } else {
     55      resultString += "FAIL - Element " + id2 + " had a non-zero scrollTop: " + scrollTop2 + "<br>";
     56    }
     57   
     58    for (i=0; i < sameValues.length; i++) {
     59      id1 = sameValues[i][0];
     60      id2 = sameValues[i][1];
     61      element1 = document.getElementById(id1);
     62      element2 = document.getElementById(id2);
     63      scrollTop1 = element1.scrollTop;
     64      scrollTop2 = element2.scrollTop;
     65      if (scrollTop1 == scrollTop2) {
     66        resultString += "PASS - Element " + id1 + " and Element " + id2 + " both had the same scrollTop<br>";
    4267      } else {
    43         resultString += "PASS - Element " + id + " had scrollTop: " + currentScrollTop + "<br>";
     68        resultString += "FAIL - Element " + id1 + " had scrollTop: " + scrollTop1 + " and Element " + id2 + " had scrollTop: " + scrollTop2 + "<br>";
    4469      }
    4570    }
    … …  
    140165</div>
    141166
     167<div class="container" id="c-transformed">
     168  <div class="scrolled offset">
     169    <p>
     170    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     171    </p>
     172    <p>
     173    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     174    </p>
     175    <p><span class="scrollTrigger">this is a span scroll trigger</span></p>
     176  </div>
     177</div>
     178
     179<br>
     180
    142181<div class="container" id="d">
    143   <div class="scrolled offset">
    144     <p>
    145     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    146     </p>
    147     <p>
    148     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    149     </p>
    150     <p><span class="scrollTrigger">this is a span scroll trigger</span></p>
     182  <div class="scrolled">
     183    <p>
     184    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     185    </p>
     186    <p>
     187    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     188    </p>
     189    <img class="scrollTrigger" src="../forms/resources/apple.gif">
     190  </div>
     191</div>
     192
     193<div class="container" id="d-transformed">
     194  <div class="scrolled offset">
     195    <p>
     196    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     197    </p>
     198    <p>
     199    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     200    </p>
     201    <img class="scrollTrigger" src="../forms/resources/apple.gif">
    151202  </div>
    152203</div>
    … …  
    162213    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    163214    </p>
    164     <img class="scrollTrigger" src="../forms/resources/apple.gif">
    165   </div>
    166 </div>
     215    <div class="scrollTrigger"><img src="../forms/resources/apple.gif"><div>this is a div scroll trigger</div></div>
     216  </div>
     217</div>
     218
     219<div class="container" id="e-transformed">
     220  <div class="scrolled offset">
     221    <p>
     222    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     223    </p>
     224    <p>
     225    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     226    </p>
     227    <div class="scrollTrigger"><img src="../forms/resources/apple.gif"><div>this is a div scroll trigger</div></div>
     228  </div>
     229</div>
     230
     231<br>
    167232
    168233<div class="container" id="f">
    169   <div class="scrolled offset">
    170     <p>
    171     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    172     </p>
    173     <p>
    174     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    175     </p>
    176     <img class="scrollTrigger" src="../forms/resources/apple.gif">
    177   </div>
    178 </div>
    179 
    180 <br>
    181 
    182 <div class="container" id="g">
    183   <div class="scrolled">
    184     <p>
    185     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    186     </p>
    187     <p>
    188     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    189     </p>
    190     <div class="scrollTrigger"><img src="../forms/resources/apple.gif"><div>this is a div scroll trigger</div></div>
    191   </div>
    192 </div>
    193 
    194 <div class="container" id="h">
    195   <div class="scrolled offset">
    196     <p>
    197     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    198     </p>
    199     <p>
    200     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
    201     </p>
    202     <div class="scrollTrigger"><img src="../forms/resources/apple.gif"><div>this is a div scroll trigger</div></div>
    203   </div>
    204 </div>
    205 
    206 <br>
    207 
    208 <div class="container" id="i">
    209234  <div class="scrolled">
    210235    <p>
    … …  
    218243</div>
    219244
    220 <div class="container" id="j">
     245<div class="container" id="f-transformed">
    221246  <div class="scrolled offset">
    222247    <p>
Note: See TracChangeset for help on using the changeset viewer.