Changeset 149802 in webkit


Ignore:
Timestamp:
May 9, 2013, 6:48:30 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt][EFL][GTK] Failing CSS region tests
https://bugs.webkit.org/show_bug.cgi?id=115785

Patch by Radu Stavila <stavila@adobe.com> on 2013-05-09
Reviewed by Antti Koivisto.

Updated tests to overcome platform differences
Unskip fixed CSS regions tests

  • fast/regions/webkit-flow-double-pagination-float-push-expected.html:
  • fast/regions/webkit-flow-double-pagination-float-push.html:
  • fast/regions/webkit-flow-float-pushed-to-last-region-expected.html:
  • fast/regions/webkit-flow-float-pushed-to-last-region.html:
  • fast/regions/webkit-flow-float-unable-to-push-expected.html:
  • fast/regions/webkit-flow-float-unable-to-push.html:
  • fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html:
  • fast/regions/webkit-flow-floats-inside-regions-bounds.html:
  • platform/qt/TestExpectations:
Location:
trunk/LayoutTests
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r149801 r149802  
     12013-05-09  Radu Stavila  <stavila@adobe.com>
     2
     3        [Qt][EFL][GTK] Failing CSS region tests
     4        https://bugs.webkit.org/show_bug.cgi?id=115785
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Updated tests to overcome platform differences
     9        Unskip fixed CSS regions tests
     10
     11        * fast/regions/webkit-flow-double-pagination-float-push-expected.html:
     12        * fast/regions/webkit-flow-double-pagination-float-push.html:
     13        * fast/regions/webkit-flow-float-pushed-to-last-region-expected.html:
     14        * fast/regions/webkit-flow-float-pushed-to-last-region.html:
     15        * fast/regions/webkit-flow-float-unable-to-push-expected.html:
     16        * fast/regions/webkit-flow-float-unable-to-push.html:
     17        * fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html:
     18        * fast/regions/webkit-flow-floats-inside-regions-bounds.html:
     19        * platform/qt/TestExpectations:
     20
    1212013-05-09  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
    222
  • trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push-expected.html

    r149668 r149802  
    33 <style>
    44    .test_paragraph {
    5         margin-top: 16px;
     5        margin-top: 1em;
     6        margin-bottom: 1em;
    67        text-align: justify;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    711    }
    812
    913    #top_paragraph {
    10         margin-bottom: 16px;
     14        margin-top: 1em;
     15        margin-bottom: 1em;
    1116    }
    1217
     
    7782        border-top: none;
    7883        width: 366px;
    79         height: 300px;
    8084    }
    8185
     
    9599</style>
    96100
    97 <div id="top_paragraph" class="test_paragraph">In the example below, the first float pushes content into region #2, and the second float pushes both floats into region #3.</div>
     101<div id="top_paragraph">In the example below, the first float pushes content into region #2, and the second float pushes both floats into region #3.</div>
    98102
    99103<div id="content">
  • trunk/LayoutTests/fast/regions/webkit-flow-double-pagination-float-push.html

    r97701 r149802  
    66        text-align: justify;
    77        padding: 5px;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    811    }
    912   
  • trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region-expected.html

    r149668 r149802  
    33 <style>
    44    .test_paragraph {
    5         margin-top: 16px;
     5        margin-top: 1em;
     6        margin-bottom: 1em;
    67        text-align: justify;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    711    }
    812   
     
    7377        border-top: none;
    7478        width: 366px;
    75         height: 246px;
    7679    }
    7780
  • trunk/LayoutTests/fast/regions/webkit-flow-float-pushed-to-last-region.html

    r149668 r149802  
    22
    33 <style>
     4    p {
     5        font-size: 10px;
     6        font-family: Ahem;
     7        -webkit-font-smoothing: none;
     8    }
     9   
    410    #content {
    511        -webkit-flow-into: flow1;
  • trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push-expected.html

    r149668 r149802  
    33 <style>
    44    .test_paragraph {
    5         margin-top: 16px;
     5        margin-top: 1em;
     6        margin-bottom: 1em;
    67        text-align: justify;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    711    }
    812
     
    9195        border-top: none;
    9296        width: 366px;
    93         height: 104px;
    9497    }
    9598
     
    101104    #float1 {
    102105        width: 130px;
    103         height: 57px;
     106        height: 63px;
    104107    }
    105108
    106109    #float2 {
    107110        width: 30px;
    108         height: 43px;
     111        height: 37px;
    109112    }
    110113
     
    113116        background-color: green;
    114117        width: 100px;
    115         height: 43px;
     118        height: 37px;
    116119        left: 292px;
    117120        top: 101px;
     
    123126        <div id="first-box1">
    124127            <div id="second-box1">
    125                 <div class="test_paragraph" id="paragraph1">This line of text should not get<img class="imgFloat" id="float1" src="resources/transparent.png"> out of the region. This line of text should not get out of the region. This line of</div>
     128                <div class="test_paragraph" id="paragraph1">This <img class="imgFloat" id="float1" src="resources/transparent.png">line of text should not get out of the region. This line of text should not get out of the region. This line of text should not</div>
    126129            </div>
    127130        </div>
     
    131134        <div id="first-box2">
    132135            <div id="second-box2">
    133                 <div class="test_paragraph" id="first-paragraph2">text should not get<img class="imgFloat" id="float2" src="resources/transparent.png"> out of the region. This line of text should not get out of the region.</div>
    134                 <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the</div>
     136                <div class="test_paragraph" id="first-paragraph2">get<img class="imgFloat" id="float2" src="resources/transparent.png"> out of the region. This line of text should not get out of the region.</div>
     137                <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the region. This line of text should not get out of the region.</div>
    135138            </div>
    136139        </div>
     
    142145        <div id="first-box3">
    143146            <div id="second-box3">
    144                 <div class="test_paragraph" id="first-paragraph3">region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
     147                <div class="test_paragraph" id="first-paragraph3">This line of text should not get out of the region. This line of text should not get out of the region.</div>
    145148                <div class="test_paragraph" id="second-paragraph3">This line of text should not get out of the region.</div>
    146149            </div>
  • trunk/LayoutTests/fast/regions/webkit-flow-float-unable-to-push.html

    r149668 r149802  
    66        text-align: justify;
    77        padding: 5px;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    811    }
    912   
  • trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds-expected.html

    r149668 r149802  
    33 <style>
    44    .test_paragraph {
    5         margin-top: 16px;
     5        margin-top: 1em;
     6        margin-bottom: 1em;
    67        text-align: justify;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    711    }
    812   
     
    3034        margin-top: 0px;
    3135    }
    32    
     36
    3337    /* Created to justify the last line of text in the div */
    34     #second-paragraph2:after {
     38    #third-paragraph2:after {
    3539        content: " ____";
    3640        line-height: 0;
     
    6266    }
    6367
    64     #first-paragraph3 {
     68    #paragraph3 {
    6569        margin-top: 0px;
    6670    }
     
    8488        border-top: none;
    8589        width: 86px;
    86         height: 158px;
    8790    }
    8891
     
    99102        <div id="first-box1">
    100103            <div id="second-box1">
    101                 <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region.</div>
     104                <div class="test_paragraph" id="paragraph1">This line of text should not get out of the region. This line of text should not get</div>
    102105            </div>
    103106        </div>
     
    107110        <div id="first-box2">
    108111            <div id="second-box2">
    109                 <div class="test_paragraph" id="first-paragraph2">This line of text<div id="float1">Float 1</div> should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
    110                 <div class="test_paragraph" id="second-paragraph2">This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text</div>
     112                <div class="test_paragraph" id="first-paragraph2">out of the region. <div id="float1">Float 1</div>This line of text should not get out of the region. This line of text should not get out of the region.</div>
     113                <div class="test_paragraph">This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</div>
     114                <div class="test_paragraph" id="third-paragraph2">This line of text should not get out of the region.</div>
    111115            </div>
    112116        </div>
     
    116120        <div id="first-box3">
    117121            <div id="second-box3">
    118                 <div class="test_paragraph" id="first-paragraph3">should not get out of the region.</div>
    119                 <div class="test_paragraph" id="second-paragraph3">This line of text should not get out of the region.</div>
     122                <div class="test_paragraph" id="paragraph3">This line of text should not get out of the region.</div>
    120123            </div>
    121124        </div>
  • trunk/LayoutTests/fast/regions/webkit-flow-floats-inside-regions-bounds.html

    r97701 r149802  
    66        text-align: justify;
    77        padding: 5px;
     8        font-size: 10px;
     9        font-family: Ahem;
     10        -webkit-font-smoothing: none;
    811    }
    912   
     
    4851    <div id="first-box">
    4952        <div id="second-box">
    50             <p>This line of text should not get out of the region.<div id="float1">Float 1</div> This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
     53            <p>This line of text should not get out of the region. This line of text should not get <div id="float1">Float 1</div>out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
    5154            <p>This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region. This line of text should not get out of the region.</p>
    52             <p>This line of text should not get out of the region.</p>
     55            <p>This line of text should not get out of the region. This line of text should not get out of the region.</p>
    5356        </div>
    5457    </div>
  • trunk/LayoutTests/platform/qt/TestExpectations

    r149732 r149802  
    23422342webkit.org/b/115512 compositing/layer-creation/deep-tree.html [ Skip ]
    23432343
    2344 # [Qt][EFL][GTK] Failing CSS region tests
    2345 webkit.org/b/115785 fast/regions/webkit-flow-double-pagination-float-push.html [ Skip ]
    2346 webkit.org/b/115785 fast/regions/webkit-flow-float-pushed-to-last-region.html [ Skip ]
    2347 webkit.org/b/115785 fast/regions/webkit-flow-float-unable-to-push.html [ Skip ]
    2348 webkit.org/b/115785 fast/regions/webkit-flow-floats-inside-regions-bounds.html [ Skip ]
    2349 
    23502344# Failing fast/css/sticky/ tests with minor pixel differences
    23512345# https://bugs.webkit.org/show_bug.cgi?id=92080
Note: See TracChangeset for help on using the changeset viewer.