Changeset 122374 in webkit


Ignore:
Timestamp:
Jul 11, 2012 2:52:22 PM (12 years ago)
Author:
ojan@chromium.org
Message:

Simplify css3/flexbox/repaint-rtl-column.html
​https://bugs.webkit.org/show_bug.cgi?id=91011

Reviewed by Tony Chang.

This test was doing something simple in a complicated way. Also, removing
the text should make it so that more ports can fallback to the same png.

  • css3/flexbox/repaint-rtl-column-expected.txt:
  • css3/flexbox/repaint-rtl-column.html:
  • platform/chromium-linux/css3/flexbox/repaint-rtl-column-expected.png:
Location:
trunk/LayoutTests
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r122372 r122374  
     12012-07-11  Ojan Vafai  <ojan@chromium.org>
     2
     3        Simplify css3/flexbox/repaint-rtl-column.html
     4        https://bugs.webkit.org/show_bug.cgi?id=91011
     5
     6        Reviewed by Tony Chang.
     7
     8        This test was doing something simple in a complicated way. Also, removing
     9        the text should make it so that more ports can fallback to the same png.
     10
     11        * css3/flexbox/repaint-rtl-column-expected.txt:
     12        * css3/flexbox/repaint-rtl-column.html:
     13        * platform/chromium-linux/css3/flexbox/repaint-rtl-column-expected.png:
     14
    1152012-07-11  Chris Fleizach  <cfleizach@apple.com>
    216

  • trunk/LayoutTests/css3/flexbox/repaint-rtl-column-expected.txt

    r98024 r122374  
    11
    2 
    3 
    4 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.

  • trunk/LayoutTests/css3/flexbox/repaint-rtl-column.html

    r119990 r122374  
    11<!DOCTYPE html>
    2 <html>
    3 <head>
    42<style>
    53#flexbox {
    6   display: -webkit-flex;
    7   -webkit-flex-flow: column;
    8   height: 300px;
    9   width: 200px;
     4    display: -webkit-flex;
     5    -webkit-flex-flow: column;
     6    height: 300px;
     7    width: 200px;
    108}
    11 
    129#left {
    13   -webkit-flex: 1;
    14   background-color: yellow;
    15   width: 100%;
     10    -webkit-flex: 1;
     11    background-color: yellow;
    1612}
    17 
    1813#content {
    19   -webkit-flex: 1;
    20   background-color: grey;
    21   width: 100%;
     14    -webkit-flex: 1;
     15    border: 5px solid blue;
     16}
     17#content > div {
     18    height: 350px;
     19    background-color: orange;
    2220}
    2321</style>
    … …  
    2725// repainted. If the top of the test page (above the flexbox) is repainted,
    2826// this test fails.
    29 
    30 function setFlex(id, animationPercentage, start, end) {
    31   var flexValue = start + ((end - start) * animationPercentage);
    32   document.getElementById(id).style.webkitFlex = flexValue + " 0 0px";
    33 }
    34 
    35 function step(count) {
    36     var animationPercentage = count ? 1 : .9;
    37     setFlex("content", animationPercentage, 1, 5);
    38 
    39     if (!count)
    40         setTimeout(step.bind(null, 1));
    41     else {
    42         if (window.testRunner)
    43             testRunner.notifyDone();
    44     }
     27function setFlex(value)
     28{
     29    document.getElementById("content").style.webkitFlex = value;
    4530}
    4631
    … …  
    5237        testRunner.waitUntilDone();
    5338    }
    54     window.startTime = Date.now();
    55 
    56     setTimeout(step.bind(null, 0), 0);
     39    setTimeout(function() {
     40        setFlex(4.6);
     41        setTimeout(function() {
     42            setFlex(5);
     43            if (window.testRunner)
     44                testRunner.notifyDone();
     45        })
     46    })
    5747};
    5848</script>
    59 </head>
    60 <body>
    61 <br><br><br>
     49<div style="height: 60px"></div>
    6250<div id="flexbox" dir="rtl">
    6351<div id="left"></div>
    64 <div id="content">
    65 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.</p>
    66 </div>
    67 </body>
    68 </html>
     52<div id="content"><div></div></div>
Note: See TracChangeset for help on using the changeset viewer.