Changeset 128027 in webkit


Ignore:
Timestamp:
Sep 10, 2012 1:00:15 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Several test cases need rebaseline after bug 88171
​https://bugs.webkit.org/show_bug.cgi?id=96240

Unreviewed EFL gardening.

Rebaseline 3 test cases due to bug 88171. The output
is much better now.

Patch by Christophe Dumez <Christophe Dumez> on 2012-09-10

  • platform/efl/TestExpectations:
  • platform/efl/css1/formatting_model/floating_elements-expected.png: Added.
  • platform/efl/css1/formatting_model/floating_elements-expected.txt:
  • platform/efl/fast/block/float/010-expected.png:
  • platform/efl/fast/block/float/010-expected.txt:
  • platform/efl/fast/block/float/independent-align-positioning-expected.png:
  • platform/efl/fast/block/float/independent-align-positioning-expected.txt:
Location:
trunk/LayoutTests
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r128026 r128027  
     12012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Several test cases need rebaseline after bug 88171
     4        https://bugs.webkit.org/show_bug.cgi?id=96240
     5
     6        Unreviewed EFL gardening.
     7
     8        Rebaseline 3 test cases due to bug 88171. The output
     9        is much better now.
     10
     11        * platform/efl/TestExpectations:
     12        * platform/efl/css1/formatting_model/floating_elements-expected.png: Added.
     13        * platform/efl/css1/formatting_model/floating_elements-expected.txt:
     14        * platform/efl/fast/block/float/010-expected.png:
     15        * platform/efl/fast/block/float/010-expected.txt:
     16        * platform/efl/fast/block/float/independent-align-positioning-expected.png:
     17        * platform/efl/fast/block/float/independent-align-positioning-expected.txt:
     18
    1192012-09-10  Csaba Osztrogonác  <ossy@webkit.org>
    220
    … …  
    725
    826        * platform/qt-5.0-wk2/Skipped:
     27
     282012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     29
     30        [EFL] Several fast/block test cases need rebaseline after r127163
     31        https://bugs.webkit.org/show_bug.cgi?id=96237
     32
     33        Unreviewed EFL gardening.
     34
     35        Rebaseline 4 fast/block test cases due to r127163.
     36
     37        * platform/efl/TestExpectations:
     38        * platform/efl/fast/block/float/024-expected.png:
     39        * platform/efl/fast/block/float/024-expected.txt:
     40        * platform/efl/fast/block/margin-collapse/025-expected.txt:
     41        * platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt:
     42        * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.png:
     43        * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt:
     44
     452012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     46
     47        [EFL] Add baseline for css3/masking test cases
     48        https://bugs.webkit.org/show_bug.cgi?id=96235
     49
     50        Unreviewed EFL gardening.
     51
     52        Generate baselines for css3/masking test cases added
     53        in r127608.
     54
     55        * platform/efl/TestExpectations:
     56        * platform/efl/css3/masking/clip-path-circle-expected.png: Added.
     57        * platform/efl/css3/masking/clip-path-circle-expected.txt: Added.
     58        * platform/efl/css3/masking/clip-path-circle-filter-expected.png: Added.
     59        * platform/efl/css3/masking/clip-path-circle-filter-expected.txt: Added.
     60        * platform/efl/css3/masking/clip-path-circle-overflow-expected.png: Added.
     61        * platform/efl/css3/masking/clip-path-circle-overflow-expected.txt: Added.
     62        * platform/efl/css3/masking/clip-path-circle-overflow-hidden-expected.png: Added.
     63        * platform/efl/css3/masking/clip-path-circle-overflow-hidden-expected.txt: Added.
     64        * platform/efl/css3/masking/clip-path-circle-relative-overflow-expected.png: Added.
     65        * platform/efl/css3/masking/clip-path-circle-relative-overflow-expected.txt: Added.
     66        * platform/efl/css3/masking/clip-path-ellipse-expected.png: Added.
     67        * platform/efl/css3/masking/clip-path-ellipse-expected.txt: Added.
     68        * platform/efl/css3/masking/clip-path-polygon-evenodd-expected.png: Added.
     69        * platform/efl/css3/masking/clip-path-polygon-evenodd-expected.txt: Added.
     70        * platform/efl/css3/masking/clip-path-polygon-expected.png: Added.
     71        * platform/efl/css3/masking/clip-path-polygon-expected.txt: Added.
     72        * platform/efl/css3/masking/clip-path-polygon-nonzero-expected.png: Added.
     73        * platform/efl/css3/masking/clip-path-polygon-nonzero-expected.txt: Added.
     74        * platform/efl/css3/masking/clip-path-rectangle-expected.png: Added.
     75        * platform/efl/css3/masking/clip-path-rectangle-expected.txt: Added.
    976
    10772012-09-10  Christophe Dumez  <christophe.dumez@intel.com>

  • trunk/LayoutTests/platform/efl/TestExpectations

    r128025 r128027  
    924924BUGWK91359 : css3/flexbox/flexbox-overflow-auto.html = IMAGE
    925925
    926 // Require rebaseline after bug 88171
    927 BUGWK88171 : fast/block/float/independent-align-positioning.html = TEXT
    928 BUGWK88171 : fast/block/float/010.html = TEXT
    929 BUGWK88171 : css1/formatting_model/floating_elements.html = TEXT
    930 
    931926// Looks like missing multipart/x-mixed-replace support in libsoup. Failing on both GTK and EFL.
    932927BUGWK68979 : http/tests/multipart/multipart-replace-non-html-content.php = TEXT

  • trunk/LayoutTests/platform/efl/css1/formatting_model/floating_elements-expected.txt

    r106177 r128027  
    1 layer at (0,0) size 785x6285
     1layer at (0,0) size 785x6281
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x6285
    4   RenderBlock {HTML} at (0,0) size 785x6285
    5     RenderBody {BODY} at (8,8) size 769x6269 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x6281
     4  RenderBlock {HTML} at (0,0) size 785x6281
     5    RenderBody {BODY} at (8,8) size 769x6265 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 355x19
    … …  
    109109          text run at (5,167) width 213: "third should be on the next \"line.\""
    110110      RenderBlock {HR} at (24,976) size 578x2 [border: (1px inset #000000)]
    111       RenderBlock {DIV} at (2,1002) size 314x352 [border: (5px solid #800080)]
     111      RenderBlock {DIV} at (2,1002) size 314x350 [border: (5px solid #800080)]
    112112        RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
    113113          RenderText {#text} at (17,17) size 130x55
    … …  
    120120            text run at (17,35) width 132: "paragraph (second in"
    121121            text run at (17,53) width 50: "source)."
    122         RenderText {#text} at (199,5) size 295x343
     122        RenderText {#text} at (199,5) size 304x341
    123123          text run at (199,5) width 69: "This is text"
    124124          text run at (199,23) width 100: "within the DIV."
    125125          text run at (199,41) width 77: "The floating"
    126126          text run at (199,59) width 99: "elements within"
    127           text run at (199,77) width 101: "this DIV should"
    128           text run at (5,95) width 91: "not go beyond"
    129           text run at (5,113) width 93: "the left or right"
    130           text run at (5,131) width 109: "inner edge of this"
    131           text run at (5,149) width 76: "DIV, which"
    132           text run at (5,167) width 90: "means that the"
    133           text run at (5,185) width 268: "borders of the floating elements should not"
    134           text run at (5,203) width 280: "overlap the top or side borders of the DIV in"
    135           text run at (5,221) width 62: "any way. "
    136           text run at (67,221) width 224: "In addition, they should not overlap"
    137           text run at (5,239) width 284: "each other in any way, nor should the floated"
    138           text run at (5,257) width 261: "elements be overwritten by the DIV text. "
    139           text run at (266,257) width 13: "In"
    140           text run at (5,275) width 273: "addition, the floated elements should not be"
    141           text run at (5,293) width 268: "side-by-side, but instead the first should be"
    142           text run at (5,311) width 288: "floated left, and the second floated to the right"
    143           text run at (5,329) width 94: "below the first."
    144       RenderBlock {HR} at (364,1362) size 40x2 [border: (1px inset #000000)]
    145       RenderBlock {DIV} at (2,1372) size 410x226 [border: (5px solid #800080)]
     127          text run at (5,93) width 101: "this DIV should"
     128          text run at (5,111) width 91: "not go beyond"
     129          text run at (5,129) width 93: "the left or right"
     130          text run at (5,147) width 109: "inner edge of this"
     131          text run at (5,165) width 76: "DIV, which"
     132          text run at (5,183) width 292: "means that the borders of the floating elements"
     133          text run at (5,201) width 301: "should not overlap the top or side borders of the"
     134          text run at (5,219) width 111: "DIV in any way. "
     135          text run at (116,219) width 173: "In addition, they should not"
     136          text run at (5,237) width 288: "overlap each other in any way, nor should the"
     137          text run at (5,255) width 304: "floated elements be overwritten by the DIV text."
     138          text run at (5,273) width 290: "In addition, the floated elements should not be"
     139          text run at (5,291) width 268: "side-by-side, but instead the first should be"
     140          text run at (5,309) width 288: "floated left, and the second floated to the right"
     141          text run at (5,327) width 94: "below the first."
     142      RenderBlock {HR} at (364,1360) size 40x2 [border: (1px inset #000000)]
     143      RenderBlock {DIV} at (2,1370) size 410x226 [border: (5px solid #800080)]
    146144        RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)]
    147145        RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)]
    148         RenderText {#text} at (261,5) size 392x217
     146        RenderText {#text} at (261,5) size 398x217
    149147          text run at (261,5) width 136: "This is text within the"
    150           text run at (261,23) width 37: "DIV. "
    151           text run at (298,23) width 77: "The floating"
    152           text run at (5,41) width 114: "images within this"
    153           text run at (5,59) width 119: "DIV should not go"
    154           text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means"
    155           text run at (5,95) width 381: "that the borders of the floating images should not overlap the"
    156           text run at (5,113) width 272: "top or side borders of the DIV in any way. "
    157           text run at (277,113) width 103: "In addition, they"
    158           text run at (5,131) width 358: "should not overlap each other in any way, nor should the"
    159           text run at (5,149) width 308: "floated elements be overwritten by the DIV text. "
    160           text run at (313,149) width 72: "In addition,"
    161           text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the"
    162           text run at (5,185) width 381: "first should be floated left, and the second floated to the right"
    163           text run at (5,203) width 94: "below the first."
    164       RenderBlock {HR} at (24,1622) size 578x2 [border: (1px inset #000000)]
    165       RenderBlock {DIV} at (2,1648) size 765x118 [border: (5px solid #800080)]
     148          text run at (5,41) width 37: "DIV. "
     149          text run at (42,41) width 77: "The floating"
     150          text run at (5,59) width 114: "images within this"
     151          text run at (5,77) width 380: "DIV should not go beyond the left or right inner edge of this"
     152          text run at (5,95) width 361: "DIV, which means that the borders of the floating images"
     153          text run at (5,113) width 377: "should not overlap the top or side borders of the DIV in any"
     154          text run at (5,131) width 35: "way. "
     155          text run at (40,131) width 336: "In addition, they should not overlap each other in any"
     156          text run at (5,149) width 369: "way, nor should the floated elements be overwritten by the"
     157          text run at (5,167) width 64: "DIV text. "
     158          text run at (69,167) width 334: "In addition, the floated images should not be side-by-"
     159          text run at (5,185) width 390: "side, but instead the first should be floated left, and the second"
     160          text run at (5,203) width 213: "floated to the right below the first."
     161      RenderBlock {HR} at (24,1620) size 578x2 [border: (1px inset #000000)]
     162      RenderBlock {DIV} at (2,1646) size 765x118 [border: (5px solid #800080)]
    166163        RenderBlock (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
    167164          RenderText {#text} at (17,17) size 139x55
    … …  
    183180          text run at (261,77) width 264: "In addition, the top of the left-floating box"
    184181          text run at (5,95) width 365: "should not be higher than the top of the right-floating box."
    185       RenderBlock {HR} at (364,1774) size 40x2 [border: (1px inset #000000)]
    186       RenderBlock {DIV} at (2,1784) size 765x64 [border: (5px solid #800080)]
     182      RenderBlock {HR} at (364,1772) size 40x2 [border: (1px inset #000000)]
     183      RenderBlock {DIV} at (2,1782) size 765x64 [border: (5px solid #800080)]
    187184        RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
    188185        RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)]
    … …  
    193190          text run at (5,41) width 35: "way. "
    194191          text run at (40,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image."
    195       RenderBlock {HR} at (24,1872) size 578x2 [border: (1px inset #000000)]
    196       RenderBlock {DIV} at (2,1898) size 765x136 [border: (5px solid #800080)]
     192      RenderBlock {HR} at (24,1870) size 578x2 [border: (1px inset #000000)]
     193      RenderBlock {DIV} at (2,1896) size 765x136 [border: (5px solid #800080)]
    197194        RenderText {#text} at (199,5) size 185x19
    198195          text run at (199,5) width 177: "This is text within the DIV. "
    … …  
    220217          text run at (5,95) width 545: "order to mark these points clearly, an asterisk has been inserted just before each floated"
    221218          text run at (5,113) width 53: "element."
    222       RenderBlock {HR} at (364,2042) size 40x2 [border: (1px inset #000000)]
    223       RenderBlock {DIV} at (2,2052) size 765x82 [border: (5px solid #800080)]
     219      RenderBlock {HR} at (364,2040) size 40x2 [border: (1px inset #000000)]
     220      RenderBlock {DIV} at (2,2050) size 765x82 [border: (5px solid #800080)]
    224221        RenderText {#text} at (20,5) size 185x19
    225222          text run at (20,5) width 177: "This is text within the DIV. "
    … …  
    236233          text run at (730,41) width 13: "In"
    237234          text run at (5,59) width 591: "order to mark these points clearly, an asterisk has been inserted just before each floated image."
    238       RenderBlock {HR} at (24,2158) size 578x2 [border: (1px inset #000000)]
    239       RenderBlock {DIV} at (2,2184) size 765x262 [border: (5px solid #800080)]
     235      RenderBlock {HR} at (24,2156) size 578x2 [border: (1px inset #000000)]
     236      RenderBlock {DIV} at (2,2182) size 765x262 [border: (5px solid #800080)]
    240237        RenderText {#text} at (199,5) size 185x19
    241238          text run at (199,5) width 177: "This is text within the DIV. "
    … …  
    286283          text run at (5,239) width 173: "which the asterisk appears. "
    287284          text run at (178,239) width 402: "Otherwise, its top should align with the top of the next line-box."
    288       RenderBlock {HR} at (364,2454) size 40x2 [border: (1px inset #000000)]
    289       RenderBlock {DIV} at (2,2464) size 765x118 [border: (5px solid #800080)]
     285      RenderBlock {HR} at (364,2452) size 40x2 [border: (1px inset #000000)]
     286      RenderBlock {DIV} at (2,2462) size 765x118 [border: (5px solid #800080)]
    290287        RenderText {#text} at (20,5) size 185x19
    291288          text run at (20,5) width 177: "This is text within the DIV. "
    … …  
    313310          text run at (5,95) width 173: "which the asterisk appears. "
    314311          text run at (178,95) width 402: "Otherwise, its top should align with the top of the next line-box."
    315       RenderBlock {HR} at (24,2606) size 578x2 [border: (1px inset #000000)]
    316       RenderBlock {DIV} at (2,2632) size 490x298 [border: (5px solid #800080)]
     312      RenderBlock {HR} at (24,2604) size 578x2 [border: (1px inset #000000)]
     313      RenderBlock {DIV} at (2,2630) size 490x298 [border: (5px solid #800080)]
    317314        RenderText {#text} at (199,5) size 54x19
    318315          text run at (199,5) width 54: "This is *"
    … …  
    346343          text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it"
    347344          text run at (5,275) width 150: "in the source document."
    348       RenderBlock {HR} at (364,2938) size 40x2 [border: (1px inset #000000)]
    349       RenderBlock {DIV} at (2,2948) size 490x226 [border: (5px solid #800080)]
     345      RenderBlock {HR} at (364,2936) size 40x2 [border: (1px inset #000000)]
     346      RenderBlock {DIV} at (2,2946) size 490x226 [border: (5px solid #800080)]
    350347        RenderText {#text} at (20,5) size 54x19
    351348          text run at (20,5) width 54: "This is *"
    … …  
    369366          text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source"
    370367          text run at (5,203) width 66: "document."
    371       RenderBlock {HR} at (24,3198) size 578x2 [border: (1px inset #000000)]
    372       RenderTable {TABLE} at (0,3224) size 769x3045 [border: (1px outset #808080)]
    373         RenderTableSection {TBODY} at (1,1) size 767x3043
     368      RenderBlock {HR} at (24,3196) size 578x2 [border: (1px inset #000000)]
     369      RenderTable {TABLE} at (0,3222) size 769x3043 [border: (1px outset #808080)]
     370        RenderTableSection {TBODY} at (1,1) size 767x3041
    374371          RenderTableRow {TR} at (0,0) size 767x26
    375372            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
    … …  
    377374                RenderText {#text} at (4,4) size 163x19
    378375                  text run at (4,4) width 163: "TABLE Testing Section"
    379           RenderTableRow {TR} at (0,26) size 767x3017
    380             RenderTableCell {TD} at (0,1521) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     376          RenderTableRow {TR} at (0,26) size 767x3015
     377            RenderTableCell {TD} at (0,1520) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    381378              RenderText {#text} at (4,4) size 4x19
    382379                text run at (4,4) width 4: " "
    383             RenderTableCell {TD} at (12,26) size 755x3017 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     380            RenderTableCell {TD} at (12,26) size 755x3015 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    384381              RenderBlock {P} at (4,4) size 747x54
    385382                RenderText {#text} at (0,0) size 740x55
    … …  
    465462                  text run at (5,167) width 213: "third should be on the next \"line.\""
    466463              RenderBlock {HR} at (28,798) size 562x2 [border: (1px inset #000000)]
    467               RenderBlock {DIV} at (6,824) size 314x352 [border: (5px solid #800080)]
     464              RenderBlock {DIV} at (6,824) size 314x350 [border: (5px solid #800080)]
    468465                RenderBlock (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
    469466                  RenderText {#text} at (17,17) size 130x55
    … …  
    476473                    text run at (17,35) width 132: "paragraph (second in"
    477474                    text run at (17,53) width 50: "source)."
    478                 RenderText {#text} at (199,5) size 295x343
     475                RenderText {#text} at (199,5) size 304x341
    479476                  text run at (199,5) width 69: "This is text"
    480477                  text run at (199,23) width 100: "within the DIV."
    481478                  text run at (199,41) width 77: "The floating"
    482479                  text run at (199,59) width 99: "elements within"
    483                   text run at (199,77) width 101: "this DIV should"
    484                   text run at (5,95) width 91: "not go beyond"
    485                   text run at (5,113) width 93: "the left or right"
    486                   text run at (5,131) width 109: "inner edge of this"
    487                   text run at (5,149) width 76: "DIV, which"
    488                   text run at (5,167) width 90: "means that the"
    489                   text run at (5,185) width 268: "borders of the floating elements should not"
    490                   text run at (5,203) width 280: "overlap the top or side borders of the DIV in"
    491                   text run at (5,221) width 62: "any way. "
    492                   text run at (67,221) width 224: "In addition, they should not overlap"
    493                   text run at (5,239) width 284: "each other in any way, nor should the floated"
    494                   text run at (5,257) width 261: "elements be overwritten by the DIV text. "
    495                   text run at (266,257) width 13: "In"
    496                   text run at (5,275) width 273: "addition, the floated elements should not be"
    497                   text run at (5,293) width 268: "side-by-side, but instead the first should be"
    498                   text run at (5,311) width 288: "floated left, and the second floated to the right"
    499                   text run at (5,329) width 94: "below the first."
    500               RenderBlock {HR} at (358,1184) size 39x2 [border: (1px inset #000000)]
    501               RenderBlock {DIV} at (6,1194) size 410x226 [border: (5px solid #800080)]
     480                  text run at (5,93) width 101: "this DIV should"
     481                  text run at (5,111) width 91: "not go beyond"
     482                  text run at (5,129) width 93: "the left or right"
     483                  text run at (5,147) width 109: "inner edge of this"
     484                  text run at (5,165) width 76: "DIV, which"
     485                  text run at (5,183) width 292: "means that the borders of the floating elements"
     486                  text run at (5,201) width 301: "should not overlap the top or side borders of the"
     487                  text run at (5,219) width 111: "DIV in any way. "
     488                  text run at (116,219) width 173: "In addition, they should not"
     489                  text run at (5,237) width 288: "overlap each other in any way, nor should the"
     490                  text run at (5,255) width 304: "floated elements be overwritten by the DIV text."
     491                  text run at (5,273) width 290: "In addition, the floated elements should not be"
     492                  text run at (5,291) width 268: "side-by-side, but instead the first should be"
     493                  text run at (5,309) width 288: "floated left, and the second floated to the right"
     494                  text run at (5,327) width 94: "below the first."
     495              RenderBlock {HR} at (358,1182) size 39x2 [border: (1px inset #000000)]
     496              RenderBlock {DIV} at (6,1192) size 410x226 [border: (5px solid #800080)]
    502497                RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)]
    503498                RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)]
    504                 RenderText {#text} at (261,5) size 392x217
     499                RenderText {#text} at (261,5) size 398x217
    505500                  text run at (261,5) width 136: "This is text within the"
    506                   text run at (261,23) width 37: "DIV. "
    507                   text run at (298,23) width 77: "The floating"
    508                   text run at (5,41) width 114: "images within this"
    509                   text run at (5,59) width 119: "DIV should not go"
    510                   text run at (5,77) width 381: "beyond the left or right inner edge of this DIV, which means"
    511                   text run at (5,95) width 381: "that the borders of the floating images should not overlap the"
    512                   text run at (5,113) width 272: "top or side borders of the DIV in any way. "
    513                   text run at (277,113) width 103: "In addition, they"
    514                   text run at (5,131) width 358: "should not overlap each other in any way, nor should the"
    515                   text run at (5,149) width 308: "floated elements be overwritten by the DIV text. "
    516                   text run at (313,149) width 72: "In addition,"
    517                   text run at (5,167) width 382: "the floated images should not be side-by-side, but instead the"
    518                   text run at (5,185) width 381: "first should be floated left, and the second floated to the right"
    519                   text run at (5,203) width 94: "below the first."
    520               RenderBlock {HR} at (28,1444) size 562x2 [border: (1px inset #000000)]
    521               RenderBlock {DIV} at (6,1470) size 743x118 [border: (5px solid #800080)]
     501                  text run at (5,41) width 37: "DIV. "
     502                  text run at (42,41) width 77: "The floating"
     503                  text run at (5,59) width 114: "images within this"
     504                  text run at (5,77) width 380: "DIV should not go beyond the left or right inner edge of this"
     505                  text run at (5,95) width 361: "DIV, which means that the borders of the floating images"
     506                  text run at (5,113) width 377: "should not overlap the top or side borders of the DIV in any"
     507                  text run at (5,131) width 35: "way. "
     508                  text run at (40,131) width 336: "In addition, they should not overlap each other in any"
     509                  text run at (5,149) width 369: "way, nor should the floated elements be overwritten by the"
     510                  text run at (5,167) width 64: "DIV text. "
     511                  text run at (69,167) width 334: "In addition, the floated images should not be side-by-"
     512                  text run at (5,185) width 390: "side, but instead the first should be floated left, and the second"
     513                  text run at (5,203) width 213: "floated to the right below the first."
     514              RenderBlock {HR} at (28,1442) size 562x2 [border: (1px inset #000000)]
     515              RenderBlock {DIV} at (6,1468) size 743x118 [border: (5px solid #800080)]
    522516                RenderBlock (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)]
    523517                  RenderText {#text} at (17,17) size 139x55
    … …  
    539533                  text run at (333,77) width 188: "In addition, the top of the left-"
    540534                  text run at (5,95) width 445: "floating box should not be higher than the top of the right-floating box."
    541               RenderBlock {HR} at (358,1596) size 39x2 [border: (1px inset #000000)]
    542               RenderBlock {DIV} at (6,1606) size 743x64 [border: (5px solid #800080)]
     535              RenderBlock {HR} at (358,1594) size 39x2 [border: (1px inset #000000)]
     536              RenderBlock {DIV} at (6,1604) size 743x64 [border: (5px solid #800080)]
    543537                RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)]
    544538                RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)]
    … …  
    549543                  text run at (5,41) width 62: "any way. "
    550544                  text run at (67,41) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image."
    551               RenderBlock {HR} at (28,1694) size 562x2 [border: (1px inset #000000)]
    552               RenderBlock {DIV} at (6,1720) size 743x136 [border: (5px solid #800080)]
     545              RenderBlock {HR} at (28,1692) size 562x2 [border: (1px inset #000000)]
     546              RenderBlock {DIV} at (6,1718) size 743x136 [border: (5px solid #800080)]
    553547                RenderText {#text} at (199,5) size 185x19
    554548                  text run at (199,5) width 177: "This is text within the DIV. "
    … …  
    575569                  text run at (132,95) width 412: "In order to mark these points clearly, an asterisk has been inserted"
    576570                  text run at (5,113) width 203: "just before each floated element."
    577               RenderBlock {HR} at (358,1864) size 39x2 [border: (1px inset #000000)]
    578               RenderBlock {DIV} at (6,1874) size 743x82 [border: (5px solid #800080)]
     571              RenderBlock {HR} at (358,1862) size 39x2 [border: (1px inset #000000)]
     572              RenderBlock {DIV} at (6,1872) size 743x82 [border: (5px solid #800080)]
    579573                RenderText {#text} at (20,5) size 185x19
    580574                  text run at (20,5) width 177: "This is text within the DIV. "
    … …  
    591585                  text run at (5,59) width 49: "source. "
    592586                  text run at (54,59) width 608: "In order to mark these points clearly, an asterisk has been inserted just before each floated image."
    593               RenderBlock {HR} at (28,1980) size 562x2 [border: (1px inset #000000)]
    594               RenderBlock {DIV} at (6,2006) size 743x226 [border: (5px solid #800080)]
     587              RenderBlock {HR} at (28,1978) size 562x2 [border: (1px inset #000000)]
     588              RenderBlock {DIV} at (6,2004) size 743x226 [border: (5px solid #800080)]
    595589                RenderText {#text} at (199,5) size 185x19
    596590                  text run at (199,5) width 177: "This is text within the DIV. "
    … …  
    638632                  text run at (669,185) width 69: "Otherwise,"
    639633                  text run at (199,203) width 329: "its top should align with the top of the next line-box."
    640               RenderBlock {HR} at (358,2243) size 39x2 [border: (1px inset #000000)]
    641               RenderBlock {DIV} at (6,2253) size 743x118 [border: (5px solid #800080)]
     634              RenderBlock {HR} at (358,2241) size 39x2 [border: (1px inset #000000)]
     635              RenderBlock {DIV} at (6,2251) size 743x118 [border: (5px solid #800080)]
    642636                RenderText {#text} at (20,5) size 185x19
    643637                  text run at (20,5) width 177: "This is text within the DIV. "
    … …  
    664658                  text run at (5,95) width 217: "box in which the asterisk appears. "
    665659                  text run at (222,95) width 402: "Otherwise, its top should align with the top of the next line-box."
    666               RenderBlock {HR} at (28,2395) size 562x2 [border: (1px inset #000000)]
    667               RenderBlock {DIV} at (6,2421) size 490x298 [border: (5px solid #800080)]
     660              RenderBlock {HR} at (28,2393) size 562x2 [border: (1px inset #000000)]
     661              RenderBlock {DIV} at (6,2419) size 490x298 [border: (5px solid #800080)]
    668662                RenderText {#text} at (199,5) size 54x19
    669663                  text run at (199,5) width 54: "This is *"
    … …  
    697691                  text run at (5,257) width 466: "element to avoid floating elements appearing before text which precedes it"
    698692                  text run at (5,275) width 150: "in the source document."
    699               RenderBlock {HR} at (358,2727) size 39x2 [border: (1px inset #000000)]
    700               RenderBlock {DIV} at (6,2737) size 490x226 [border: (5px solid #800080)]
     693              RenderBlock {HR} at (358,2725) size 39x2 [border: (1px inset #000000)]
     694              RenderBlock {DIV} at (6,2735) size 490x226 [border: (5px solid #800080)]
    701695                RenderText {#text} at (20,5) size 54x19
    702696                  text run at (20,5) width 54: "This is *"
    … …  
    720714                  text run at (5,185) width 442: "floating elements appearing before text which precedes it in the source"
    721715                  text run at (5,203) width 66: "document."
    722               RenderBlock {HR} at (28,2987) size 562x2 [border: (1px inset #000000)]
     716              RenderBlock {HR} at (28,2985) size 562x2 [border: (1px inset #000000)]

  • trunk/LayoutTests/platform/efl/fast/block/float/010-expected.txt

    r106181 r128027  
    1010      RenderBlock (floating) {DIV} at (0,100) size 160x200 [bgcolor=#FF0000]
    1111      RenderBlock (floating) {DIV} at (384,100) size 100x100 [bgcolor=#808000]
    12       RenderText {#text} at (492,0) size 415x163
     12      RenderText {#text} at (492,0) size 415x155
    1313        text run at (492,0) width 67: "Some text."
    1414        text run at (492,18) width 74: "This should"
    … …  
    1616        text run at (492,54) width 79: "wrap among"
    1717        text run at (492,72) width 76: "all the floats"
    18         text run at (492,90) width 48: "without"
    19         text run at (160,108) width 162: "overlapping any of them. "
    20         text run at (322,108) width 55: "It should"
    21         text run at (160,126) width 201: "start just under the blue box and"
    22         text run at (160,144) width 133: "wrap to several lines."
     18        text run at (160,100) width 214: "without overlapping any of them. "
     19        text run at (374,100) width 9: "It"
     20        text run at (160,118) width 220: "should start just under the blue box"
     21        text run at (160,136) width 160: "and wrap to several lines."

  • trunk/LayoutTests/platform/efl/fast/block/float/independent-align-positioning-expected.txt

    r106181 r128027  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x140
    4   RenderBlock {HTML} at (0,0) size 800x140
    5     RenderBody {BODY} at (8,16) size 784x108
     3layer at (0,0) size 800x158
     4  RenderBlock {HTML} at (0,0) size 800x158
     5    RenderBody {BODY} at (8,16) size 784x126
    66      RenderBlock (floating) {DIV} at (556,0) size 228x58 [bgcolor=#CC6666]
    77        RenderText {#text} at (20,20) size 188x19
    … …  
    1313        RenderText {#text} at (20,20) size 179x19
    1414          text run at (20,20) width 179: "DIV NUMBER 3: float:left;"
    15       RenderBlock {P} at (0,0) size 784x108
    16         RenderText {#text} at (0,0) size 556x91
     15      RenderBlock {P} at (0,0) size 784x126
     16        RenderText {#text} at (0,0) size 556x109
    1717          text run at (0,0) width 528: "The first element is floated to the right. The second element clears the right float and"
    1818          text run at (0,18) width 556: "also floats right. The third element is floated to the left, but is forced below the bottom of"
    1919          text run at (0,36) width 525: "the first element. Yet, somehow this paragraph comes at the end of the markup, and"
    20           text run at (0,54) width 530: "manages to rise to the top of the page. This behavior is present in Firefox, Safari and"
    21           text run at (219,72) width 47: "Opera. "
    22         RenderInline {A} at (0,0) size 227x37 [color=#0000EE]
    23           RenderInline {STRONG} at (0,0) size 227x37
    24             RenderText {#text} at (266,72) size 227x37
    25               text run at (266,72) width 180: "Click here for a real world"
    26               text run at (219,90) width 135: "example of this bug."
     20          text run at (219,54) width 238: "manages to rise to the top of the page."
     21          text run at (219,72) width 261: "This behavior is present in Firefox, Safari"
     22          text run at (219,90) width 74: "and Opera. "
     23        RenderInline {A} at (0,0) size 254x37 [color=#0000EE]
     24          RenderInline {STRONG} at (0,0) size 254x37
     25            RenderText {#text} at (293,90) size 254x37
     26              text run at (293,90) width 180: "Click here for a real world"
     27              text run at (219,108) width 135: "example of this bug."
Note: See TracChangeset for help on using the changeset viewer.