Changeset 154757 in webkit


Ignore:
Timestamp:
Aug 28, 2013 10:11:40 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Exclusions] Differentiate names in the simple rectangle test script
​https://bugs.webkit.org/show_bug.cgi?id=105208

Patch by Niklas Nielsen <​nnielsen@adobe.com> on 2013-08-28
Reviewed by Alexandru Chiculita.

Rename createRectangleTest and createRectangleTestResult to drawTestRectangle and drawExpectedRectangle respectively.

  • fast/shapes/resources/simple-rectangle.js:

(drawTextRectangle):
(drawExpectedRectangle):

  • fast/shapes/shape-inside/shape-inside-floats-simple-expected.html:
  • fast/shapes/shape-inside/shape-inside-floats-simple.html:
  • fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html:
  • fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html:
  • fast/shapes/shape-inside/shape-inside-outside-shape-expected.html:
  • fast/shapes/shape-inside/shape-inside-outside-shape.html:
  • fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html:
  • fast/shapes/shape-inside/shape-inside-recursive-layout.html:
  • fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html:
  • fast/shapes/shape-inside/shape-inside-subsequent-blocks.html:
Location:
trunk/LayoutTests
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r154753 r154757  
     12013-08-28  Niklas Nielsen  <nnielsen@adobe.com>
     2
     3        [CSS Exclusions] Differentiate names in the simple rectangle test script
     4        https://bugs.webkit.org/show_bug.cgi?id=105208
     5
     6        Reviewed by Alexandru Chiculita.
     7
     8        Rename createRectangleTest and createRectangleTestResult to drawTestRectangle and drawExpectedRectangle respectively.
     9
     10        * fast/shapes/resources/simple-rectangle.js:
     11        (drawTextRectangle):
     12        (drawExpectedRectangle):
     13        * fast/shapes/shape-inside/shape-inside-floats-simple-expected.html:
     14        * fast/shapes/shape-inside/shape-inside-floats-simple.html:
     15        * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html:
     16        * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html:
     17        * fast/shapes/shape-inside/shape-inside-outside-shape-expected.html:
     18        * fast/shapes/shape-inside/shape-inside-outside-shape.html:
     19        * fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html:
     20        * fast/shapes/shape-inside/shape-inside-recursive-layout.html:
     21        * fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html:
     22        * fast/shapes/shape-inside/shape-inside-subsequent-blocks.html:
     23
    1242013-08-28  Sergio Villar Senin  <svillar@igalia.com>
    225

  • trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js

    r154500 r154757  
    1 function createRectangleTest(elementId, stylesheetId, bounds, shapeBounds, units, content) {
     1function drawTextRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
    22    var elem;
    33    if (elementId)
    … …  
    2828}
    2929
    30 function createRectangleTestResult(elementId, stylesheetId, bounds, shapeBounds, units, content) {
     30function drawExpectedRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
    3131    var elem;
    3232    if (elementId)

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple-expected.html

    r152800 r154757  
    2222    window.onload = function () {
    2323        var content = 'XXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\n<div class="spacer" style="float:right"></div>\n<div class="spacer" style="float:left"></div>\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX';
    24         createRectangleTestResult('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
    25         createRectangleTestResult('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
    26         createRectangleTestResult('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
     24        drawExpectedRectangle('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
     25        drawExpectedRectangle('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
     26        drawExpectedRectangle('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
    2727    };
    2828</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple.html

    r152800 r154757  
    2222    window.onload = function () {
    2323        var content = 'XXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\n<div class="spacer" style="float:right"></div>\n<div class="spacer" style="float:left"></div>\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX';
    24         createRectangleTest('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
    25         createRectangleTest('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
    26         createRectangleTest('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
     24        drawTextRectangle('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
     25        drawTextRectangle('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
     26        drawTextRectangle('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
    2727    };
    2828</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html

    r152800 r154757  
    1414<script>
    1515    window.onload = function() {
    16         createRectangleTestResult('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    17         createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     16        drawExpectedRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     17        drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    1818    };
    1919</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html

    r152800 r154757  
    1414<script>
    1515    window.onload = function() {
    16         createRectangleTest('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
    17         createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
     16        drawTextRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
     17        drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
    1818    };
    1919</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape-expected.html

    r152800 r154757  
    1616<script>
    1717    window.onload = function() {
    18         createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
     18        drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
    1919    };
    2020</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html

    r152800 r154757  
    1717<script>
    1818    window.onload = function() {
    19         createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
     19        drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
    2020        var inlineStyle = document.getElementById('shape-inside2').style;
    2121        inlineStyle.setProperty('-webkit-shape-inside', 'outside-shape');

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html

    r152800 r154757  
    4444    var elementBounds = { width: 200, height: 200 };
    4545    var shapeBounds = { x: 50, y: 50, width: 100, height: 100 };
    46     createRectangleTestResult('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
    47     createRectangleTestResult('float', 'stylesheet', elementBounds, shapeBounds, 'px');
    48     createRectangleTestResult('list', 'stylesheet', elementBounds, shapeBounds, 'px');
    49     createRectangleTestResult('table', 'stylesheet', elementBounds, shapeBounds, 'px');
    50     createRectangleTestResult('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
    51     createRectangleTestResult('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
     46    drawExpectedRectangle('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
     47    drawExpectedRectangle('float', 'stylesheet', elementBounds, shapeBounds, 'px');
     48    drawExpectedRectangle('list', 'stylesheet', elementBounds, shapeBounds, 'px');
     49    drawExpectedRectangle('table', 'stylesheet', elementBounds, shapeBounds, 'px');
     50    drawExpectedRectangle('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
     51    drawExpectedRectangle('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
    5252}
    5353</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout.html

    r152800 r154757  
    4444    var elementBounds = { width: 200, height: 200 };
    4545    var shapeBounds = { x: 50, y: 50, width: 100, height: 100 };
    46     createRectangleTest('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
    47     createRectangleTest('float', 'stylesheet', elementBounds, shapeBounds, 'px');
    48     createRectangleTest('list', 'stylesheet', elementBounds, shapeBounds, 'px');
    49     createRectangleTest('table', 'stylesheet', elementBounds, shapeBounds, 'px');
    50     createRectangleTest('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
    51     createRectangleTest('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
     46    drawTextRectangle('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
     47    drawTextRectangle('float', 'stylesheet', elementBounds, shapeBounds, 'px');
     48    drawTextRectangle('list', 'stylesheet', elementBounds, shapeBounds, 'px');
     49    drawTextRectangle('table', 'stylesheet', elementBounds, shapeBounds, 'px');
     50    drawTextRectangle('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
     51    drawTextRectangle('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
    5252}
    5353</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html

    r152800 r154757  
    1414<script>
    1515    window.onload = function() {
    16         createRectangleTestResult('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    17         createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     16        drawExpectedRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     17        drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    1818    };
    1919</script>

  • trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks.html

    r152800 r154757  
    1414<script>
    1515    window.onload = function() {
    16         createRectangleTest('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    17         createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     16        drawTextRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
     17        drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
    1818    };
    1919</script>
Note: See TracChangeset for help on using the changeset viewer.