Changeset 147492 in webkit


Ignore:
Timestamp:
Apr 2, 2013 1:35:33 PM (11 years ago)
Author:
Christophe Dumez
Message:

fast/dom/HTMLImageElement/image-alt-text.html and fast/dom/HTMLInputElement/input-image-alt-text.html are failing
​https://bugs.webkit.org/show_bug.cgi?id=94198

Reviewed by Darin Adler.

Source/WebCore:

Fix alt text not being displayed for img elements or input of type
"image" due to insufficient size. imageSizeForError() was adding
padding for the alt text but setImageSizeForAltText() was not. The
issue was occurring in paintReplaced() because the contentWidth() /
contentHeight() would be exactly the same size as the alt text.
However, paintReplaced() first draws an outline rect where the
image should be and then reduces the usable width / height for the
alt text by 2 so that the text does not get printed over the rect
borders. However, after decreasing the usable width / height, there
is no longer enough space to draw the text.

No new tests, already covered by existing tests.

  • rendering/RenderImage.cpp:

(WebCore::RenderImage::setImageSizeForAltText): Add padding to the text size
so that the alt text can still be drawn, despite the outline rect
borders. Such padding was already used in imageSizeForError(). Also use
ceilf() for the value returned by Font::width() instead of truncating it.
This is needed because we need to fit the whole text in the image and this
may not be the case if we truncate.
(WebCore::RenderImage::paintReplaced):

LayoutTests:

Rebaseline several test cases that have better result now and add those
tests to TestExpectations for other ports since they will need a
rebaseline.

  • platform/chromium/TestExpectations:
  • platform/efl/fast/block/float/002-expected.png:
  • platform/efl/fast/block/float/017-expected.png:
  • platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png:
  • platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt:
  • platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png:
  • platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt:
  • platform/efl/fast/encoding/utf-16-big-endian-expected.png:
  • platform/efl/fast/encoding/utf-16-big-endian-expected.txt:
  • platform/efl/fast/encoding/utf-16-little-endian-expected.png:
  • platform/efl/fast/encoding/utf-16-little-endian-expected.txt:
  • platform/efl/fast/flexbox/023-expected.png:
  • platform/efl/fast/flexbox/024-expected.png:
  • platform/efl/fast/forms/input-value-expected.png:
  • platform/efl/fast/forms/input-value-expected.txt:
  • platform/efl/fast/invalid/012-expected.png:
  • platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png:
  • platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt:
  • platform/efl/fast/parser/comment-in-script-expected.png:
  • platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png:
  • platform/efl/tables/mozilla/bugs/bug2997-expected.png:
  • platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png:
  • platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt:
  • platform/gtk/TestExpectations:
  • platform/mac/TestExpectations:
  • platform/qt/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r147488 r147492  
     12013-04-02  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        fast/dom/HTMLImageElement/image-alt-text.html and fast/dom/HTMLInputElement/input-image-alt-text.html are failing
     4        https://bugs.webkit.org/show_bug.cgi?id=94198
     5
     6        Reviewed by Darin Adler.
     7
     8        Rebaseline several test cases that have better result now and add those
     9        tests to TestExpectations for other ports since they will need a
     10        rebaseline.
     11
     12        * platform/chromium/TestExpectations:
     13        * platform/efl/fast/block/float/002-expected.png:
     14        * platform/efl/fast/block/float/017-expected.png:
     15        * platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png:
     16        * platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt:
     17        * platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png:
     18        * platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt:
     19        * platform/efl/fast/encoding/utf-16-big-endian-expected.png:
     20        * platform/efl/fast/encoding/utf-16-big-endian-expected.txt:
     21        * platform/efl/fast/encoding/utf-16-little-endian-expected.png:
     22        * platform/efl/fast/encoding/utf-16-little-endian-expected.txt:
     23        * platform/efl/fast/flexbox/023-expected.png:
     24        * platform/efl/fast/flexbox/024-expected.png:
     25        * platform/efl/fast/forms/input-value-expected.png:
     26        * platform/efl/fast/forms/input-value-expected.txt:
     27        * platform/efl/fast/invalid/012-expected.png:
     28        * platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png:
     29        * platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt:
     30        * platform/efl/fast/parser/comment-in-script-expected.png:
     31        * platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png:
     32        * platform/efl/tables/mozilla/bugs/bug2997-expected.png:
     33        * platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png:
     34        * platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt:
     35        * platform/gtk/TestExpectations:
     36        * platform/mac/TestExpectations:
     37        * platform/qt/TestExpectations:
     38        * platform/win/TestExpectations:
     39
    1402013-04-02  Benjamin Poulain  <bpoulain@apple.com>
    241

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r147473 r147492  
    37843784Bug(leviw) fast/text/shaping/shaping-selection-rect.html [ Failure ]
    37853785
     3786# Needs rebaseline.
     3787webkit.org/b/94198 editing/selection/select-missing-image.html [ Failure ]
     3788webkit.org/b/94198 fast/block/float/002.html [ Failure ]
     3789webkit.org/b/94198 fast/block/float/017.html [ Failure ]
     3790webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
     3791webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
     3792webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
     3793webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
     3794webkit.org/b/94198 fast/flexbox/023.html [ Failure ]
     3795webkit.org/b/94198 fast/flexbox/024.html [ Failure ]
     3796webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
     3797webkit.org/b/94198 fast/invalid/012.html [ Failure ]
     3798webkit.org/b/94198 fast/parser/comment-in-script.html [ Failure ]
     3799webkit.org/b/94198 tables/mozilla/bugs/bug2997.html [ Failure ]
     3800webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
     3801
    37863802# Flaky tests
    37873803webkit.org/b/112598 [ Win Mac Linux ] http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html [ Failure Pass ]

  • trunk/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt

    r140147 r147492  
    88          text run at (0,0) width 779: "This tests whether alt text is shown for image elements with no src attribute. You should see \"Success\" twice, followed by a"
    99          text run at (0,18) width 92: "blue rectangle."
    10       RenderBlock {P} at (0,52) size 784x94
    11         RenderImage {IMG} at (0,0) size 50x17
    12         RenderBR {BR} at (50,17) size 0x0
    13         RenderImage {IMG} at (0,17) size 102x52 [border: (1px solid #000000)]
    14         RenderBR {BR} at (102,69) size 0x0
    15         RenderImage {IMG} at (0,69) size 75x25
    16         RenderBR {BR} at (75,94) size 0x0
     10      RenderBlock {P} at (0,52) size 784x98
     11        RenderImage {IMG} at (0,0) size 54x21
     12        RenderBR {BR} at (54,21) size 0x0
     13        RenderImage {IMG} at (0,21) size 102x52 [border: (1px solid #000000)]
     14        RenderBR {BR} at (102,73) size 0x0
     15        RenderImage {IMG} at (0,73) size 75x25
     16        RenderBR {BR} at (75,98) size 0x0

  • trunk/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt

    r140147 r147492  
    1010          text run at (0,18) width 225: "twice, followed by a blue rectangle."
    1111      RenderBlock {P} at (0,52) size 784x0
    12       RenderBlock {FORM} at (0,52) size 784x94
    13         RenderImage {INPUT} at (0,0) size 61x17
    14         RenderBR {BR} at (61,17) size 0x0
    15         RenderImage {INPUT} at (0,17) size 102x52 [border: (1px solid #000000)]
    16         RenderBR {BR} at (102,69) size 0x0
    17         RenderImage {INPUT} at (0,69) size 75x25
    18         RenderBR {BR} at (75,94) size 0x0
     12      RenderBlock {FORM} at (0,52) size 784x98
     13        RenderImage {INPUT} at (0,0) size 65x21
     14        RenderBR {BR} at (65,21) size 0x0
     15        RenderImage {INPUT} at (0,21) size 102x52 [border: (1px solid #000000)]
     16        RenderBR {BR} at (102,73) size 0x0
     17        RenderImage {INPUT} at (0,73) size 75x25
     18        RenderBR {BR} at (75,98) size 0x0

  • trunk/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.txt

    r140253 r147492  
    1 layer at (0,0) size 792x1062
     1layer at (0,0) size 792x1076
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 785x1062
    4   RenderBlock {HTML} at (0,0) size 785x1063
    5     RenderBody {BODY} at (8,8) size 769x1042 [bgcolor=#EEEEEE]
     3layer at (0,0) size 785x1076
     4  RenderBlock {HTML} at (0,0) size 785x1077
     5    RenderBody {BODY} at (8,8) size 769x1056 [bgcolor=#EEEEEE]
    66      RenderBlock (anonymous) at (0,0) size 769x20
    77        RenderInline {SPAN} at (0,0) size 191x15
    … …  
    2424      RenderBlock (anonymous) at (0,26) size 769x3
    2525        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    26       RenderBlock (anonymous) at (0,35) size 769x34
    27         RenderInline {SPAN} at (0,0) size 110x31
    28           RenderInline {SPAN} at (0,0) size 110x31
    29             RenderText {#text} at (0,0) size 0x0
    30             RenderInline {SPAN} at (0,0) size 110x17
    31               RenderText {#text} at (0,0) size 0x0
    32               RenderImage {IMG} at (0,1) size 53x17
    33               RenderText {#text} at (53,0) size 57x17
    34                 text run at (53,0) width 4: " "
    35                 text run at (57,0) width 53: "Names"
    36               RenderBR {BR} at (110,14) size 0x0
     26      RenderBlock (anonymous) at (0,35) size 769x37
     27        RenderInline {SPAN} at (0,0) size 114x33
     28          RenderInline {SPAN} at (0,0) size 114x33
     29            RenderText {#text} at (0,0) size 0x0
     30            RenderInline {SPAN} at (0,0) size 114x17
     31              RenderText {#text} at (0,0) size 0x0
     32              RenderImage {IMG} at (0,0) size 57x21
     33              RenderText {#text} at (57,1) size 57x17
     34                text run at (57,1) width 4: " "
     35                text run at (61,1) width 53: "Names"
     36              RenderBR {BR} at (114,15) size 0x0
    3737            RenderText {#text} at (0,0) size 0x0
    3838            RenderInline {SPAN} at (0,0) size 88x15
    … …  
    4141            RenderText {#text} at (0,0) size 0x0
    4242          RenderText {#text} at (0,0) size 0x0
    43       RenderBlock (anonymous) at (0,74) size 769x3
    44         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    45       RenderBlock (anonymous) at (0,83) size 769x49
    46         RenderInline {SPAN} at (0,0) size 576x46
    47           RenderInline {SPAN} at (0,0) size 576x46
    48             RenderText {#text} at (0,0) size 0x0
    49             RenderImage {IMG} at (0,3) size 62x15
    50             RenderText {#text} at (62,2) size 4x15
    51               text run at (62,2) width 4: " "
     43      RenderBlock (anonymous) at (0,77) size 769x3
     44        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     45      RenderBlock (anonymous) at (0,86) size 769x51
     46        RenderInline {SPAN} at (0,0) size 576x48
     47          RenderInline {SPAN} at (0,0) size 576x48
     48            RenderText {#text} at (0,0) size 0x0
     49            RenderImage {IMG} at (0,1) size 66x19
     50            RenderText {#text} at (66,2) size 4x15
     51              text run at (66,2) width 4: " "
    5252            RenderInline {SPAN} at (0,0) size 83x17
    53               RenderText {#text} at (66,0) size 83x17
    54                 text run at (66,0) width 83: "Addresses"
    55               RenderBR {BR} at (149,14) size 0x0
    56             RenderText {#text} at (0,0) size 0x0
    57             RenderText {#text} at (0,0) size 0x0
    58           RenderText {#text} at (0,0) size 0x0
    59       RenderBlock (anonymous) at (0,138) size 769x3
    60         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    61       RenderBlock (anonymous) at (0,146) size 769x23
    62         RenderInline {SPAN} at (0,0) size 126x23
    63           RenderInline {SPAN} at (0,0) size 126x23
    64             RenderText {#text} at (0,0) size 0x0
    65             RenderInline {SPAN} at (0,0) size 126x17
    66               RenderText {#text} at (0,0) size 0x0
    67               RenderImage {IMG} at (0,1) size 59x17
    68               RenderText {#text} at (59,0) size 67x17
    69                 text run at (59,0) width 4: " "
    70                 text run at (63,0) width 63: "Phones "
    71               RenderBR {BR} at (126,14) size 0x0
    72             RenderText {#text} at (0,0) size 0x0
    73       RenderBlock (anonymous) at (0,228) size 769x1
    74         RenderInline {SPAN} at (0,0) size 0x0
    75           RenderInline {SPAN} at (0,0) size 0x0
    76             RenderText {#text} at (0,0) size 0x0
    77           RenderText {#text} at (0,0) size 0x0
    78       RenderBlock (anonymous) at (0,235) size 769x3
    79         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    80       RenderBlock (anonymous) at (0,244) size 769x19
    81         RenderInline {SPAN} at (0,0) size 128x15
    82           RenderInline {SPAN} at (0,0) size 128x15
    83             RenderText {#text} at (0,0) size 0x0
    84             RenderInline {SPAN} at (0,0) size 128x17
    85               RenderText {#text} at (0,0) size 0x0
    86               RenderImage {IMG} at (0,1) size 62x17
    87               RenderText {#text} at (62,0) size 66x17
    88                 text run at (62,0) width 4: " "
    89                 text run at (66,0) width 62: "Itinerary"
    90             RenderText {#text} at (0,0) size 0x0
    91             RenderInline {SPAN} at (0,0) size 0x0
    92               RenderText {#text} at (0,0) size 0x0
    93               RenderInline {SPAN} at (0,0) size 0x0
    94                 RenderText {#text} at (0,0) size 0x0
    95       RenderBlock (anonymous) at (0,262) size 769x61
    96         RenderTable {TABLE} at (0,0) size 581x60
    97           RenderTableSection {TBODY} at (0,0) size 581x60
    98             RenderTableRow {TR} at (0,2) size 581x56
     53              RenderText {#text} at (70,0) size 83x17
     54                text run at (70,0) width 83: "Addresses"
     55              RenderBR {BR} at (153,14) size 0x0
     56            RenderText {#text} at (0,0) size 0x0
     57            RenderText {#text} at (0,0) size 0x0
     58          RenderText {#text} at (0,0) size 0x0
     59      RenderBlock (anonymous) at (0,143) size 769x3
     60        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     61      RenderBlock (anonymous) at (0,151) size 769x26
     62        RenderInline {SPAN} at (0,0) size 130x25
     63          RenderInline {SPAN} at (0,0) size 130x25
     64            RenderText {#text} at (0,0) size 0x0
     65            RenderInline {SPAN} at (0,0) size 130x17
     66              RenderText {#text} at (0,0) size 0x0
     67              RenderImage {IMG} at (0,0) size 63x21
     68              RenderText {#text} at (63,1) size 67x17
     69                text run at (63,1) width 4: " "
     70                text run at (67,1) width 63: "Phones "
     71              RenderBR {BR} at (130,15) size 0x0
     72            RenderText {#text} at (0,0) size 0x0
     73      RenderBlock (anonymous) at (0,236) size 769x1
     74        RenderInline {SPAN} at (0,0) size 0x0
     75          RenderInline {SPAN} at (0,0) size 0x0
     76            RenderText {#text} at (0,0) size 0x0
     77          RenderText {#text} at (0,0) size 0x0
     78      RenderBlock (anonymous) at (0,243) size 769x3
     79        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     80      RenderBlock (anonymous) at (0,252) size 769x22
     81        RenderInline {SPAN} at (0,0) size 132x15
     82          RenderInline {SPAN} at (0,0) size 132x15
     83            RenderText {#text} at (0,0) size 0x0
     84            RenderInline {SPAN} at (0,0) size 132x17
     85              RenderText {#text} at (0,0) size 0x0
     86              RenderImage {IMG} at (0,0) size 66x21
     87              RenderText {#text} at (66,1) size 66x17
     88                text run at (66,1) width 4: " "
     89                text run at (70,1) width 62: "Itinerary"
     90            RenderText {#text} at (0,0) size 0x0
     91            RenderInline {SPAN} at (0,0) size 0x0
     92              RenderText {#text} at (0,0) size 0x0
     93              RenderInline {SPAN} at (0,0) size 0x0
     94                RenderText {#text} at (0,0) size 0x0
     95      RenderBlock (anonymous) at (0,273) size 769x61
     96        RenderTable {TABLE} at (0,0) size 585x60
     97          RenderTableSection {TBODY} at (0,0) size 585x60
     98            RenderTableRow {TR} at (0,2) size 585x56
    9999              RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
    100100              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    101               RenderTableCell {TD} at (10,20) size 149x19 [r=0 c=2 rs=1 cs=1]
    102                 RenderImage {IMG} at (1,1) size 147x17
    103                 RenderText {#text} at (0,0) size 0x0
    104               RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
     101              RenderTableCell {TD} at (10,18) size 153x23 [r=0 c=2 rs=1 cs=1]
     102                RenderImage {IMG} at (1,1) size 151x21
     103                RenderText {#text} at (0,0) size 0x0
     104              RenderTableCell {TD} at (165,2) size 418x56 [r=0 c=3 rs=1 cs=1]
    105105                RenderText {#text} at (1,1) size 147x17
    106106                  text run at (1,1) width 147: "TUR - Tour Package"
    … …  
    111111                RenderText {#text} at (1,37) size 416x17
    112112                  text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
    113       RenderBlock (anonymous) at (0,322) size 769x1
    114         RenderInline {SPAN} at (0,0) size 0x0
    115           RenderInline {SPAN} at (0,0) size 0x0
    116             RenderInline {SPAN} at (0,0) size 0x0
    117               RenderInline {SPAN} at (0,0) size 0x0
    118               RenderText {#text} at (0,0) size 0x0
    119       RenderBlock (anonymous) at (0,328) size 769x3
    120         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    121       RenderBlock (anonymous) at (0,337) size 769x1
    122         RenderInline {SPAN} at (0,0) size 0x0
    123           RenderInline {SPAN} at (0,0) size 0x0
    124             RenderInline {SPAN} at (0,0) size 0x0
    125               RenderInline {SPAN} at (0,0) size 0x0
    126                 RenderText {#text} at (0,0) size 0x0
    127       RenderBlock (anonymous) at (0,337) size 769x197
    128         RenderTable {TABLE} at (0,0) size 710x196
    129           RenderTableSection {TBODY} at (0,0) size 710x196
    130             RenderTableRow {TR} at (0,2) size 710x192
     113      RenderBlock (anonymous) at (0,333) size 769x1
     114        RenderInline {SPAN} at (0,0) size 0x0
     115          RenderInline {SPAN} at (0,0) size 0x0
     116            RenderInline {SPAN} at (0,0) size 0x0
     117              RenderInline {SPAN} at (0,0) size 0x0
     118              RenderText {#text} at (0,0) size 0x0
     119      RenderBlock (anonymous) at (0,339) size 769x3
     120        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     121      RenderBlock (anonymous) at (0,348) size 769x1
     122        RenderInline {SPAN} at (0,0) size 0x0
     123          RenderInline {SPAN} at (0,0) size 0x0
     124            RenderInline {SPAN} at (0,0) size 0x0
     125              RenderInline {SPAN} at (0,0) size 0x0
     126                RenderText {#text} at (0,0) size 0x0
     127      RenderBlock (anonymous) at (0,348) size 769x197
     128        RenderTable {TABLE} at (0,0) size 714x196
     129          RenderTableSection {TBODY} at (0,0) size 714x196
     130            RenderTableRow {TR} at (0,2) size 714x192
    131131              RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
    132132              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    133               RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
    134                 RenderImage {IMG} at (1,1) size 88x17
    135                 RenderText {#text} at (0,0) size 0x0
    136               RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
     133              RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
     134                RenderImage {IMG} at (1,1) size 92x21
     135                RenderText {#text} at (0,0) size 0x0
     136              RenderTableCell {TD} at (106,2) size 606x192 [r=0 c=3 rs=1 cs=1]
    137137                RenderBlock (anonymous) at (1,1) size 604x126
    138138                  RenderText {#text} at (0,0) size 24x17
    … …  
    207207                    RenderInline {SPACE} at (0,0) size 0x17
    208208                      RenderBR {BR} at (0,0) size 0x17
    209       RenderBlock (anonymous) at (0,533) size 769x1
    210         RenderInline {SPAN} at (0,0) size 0x0
    211           RenderInline {SPAN} at (0,0) size 0x0
    212             RenderInline {SPAN} at (0,0) size 0x0
    213               RenderInline {SPAN} at (0,0) size 0x0
    214               RenderText {#text} at (0,0) size 0x0
    215       RenderBlock (anonymous) at (0,540) size 769x3
    216         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    217       RenderBlock (anonymous) at (0,548) size 769x1
    218         RenderInline {SPAN} at (0,0) size 0x0
    219           RenderInline {SPAN} at (0,0) size 0x0
    220             RenderInline {SPAN} at (0,0) size 0x0
    221               RenderInline {SPAN} at (0,0) size 0x0
    222                 RenderText {#text} at (0,0) size 0x0
    223       RenderBlock (anonymous) at (0,548) size 769x197
    224         RenderTable {TABLE} at (0,0) size 599x196
    225           RenderTableSection {TBODY} at (0,0) size 599x196
    226             RenderTableRow {TR} at (0,2) size 599x192
     209      RenderBlock (anonymous) at (0,544) size 769x1
     210        RenderInline {SPAN} at (0,0) size 0x0
     211          RenderInline {SPAN} at (0,0) size 0x0
     212            RenderInline {SPAN} at (0,0) size 0x0
     213              RenderInline {SPAN} at (0,0) size 0x0
     214              RenderText {#text} at (0,0) size 0x0
     215      RenderBlock (anonymous) at (0,551) size 769x3
     216        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     217      RenderBlock (anonymous) at (0,559) size 769x1
     218        RenderInline {SPAN} at (0,0) size 0x0
     219          RenderInline {SPAN} at (0,0) size 0x0
     220            RenderInline {SPAN} at (0,0) size 0x0
     221              RenderInline {SPAN} at (0,0) size 0x0
     222                RenderText {#text} at (0,0) size 0x0
     223      RenderBlock (anonymous) at (0,559) size 769x197
     224        RenderTable {TABLE} at (0,0) size 603x196
     225          RenderTableSection {TBODY} at (0,0) size 603x196
     226            RenderTableRow {TR} at (0,2) size 603x192
    227227              RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
    228228              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    229               RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
    230                 RenderImage {IMG} at (1,1) size 88x17
    231                 RenderText {#text} at (0,0) size 0x0
    232               RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
     229              RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
     230                RenderImage {IMG} at (1,1) size 92x21
     231                RenderText {#text} at (0,0) size 0x0
     232              RenderTableCell {TD} at (106,2) size 495x192 [r=0 c=3 rs=1 cs=1]
    233233                RenderBlock (anonymous) at (1,1) size 493x126
    234234                  RenderText {#text} at (0,0) size 24x17
    … …  
    303303                    RenderInline {SPACE} at (0,0) size 0x17
    304304                      RenderBR {BR} at (0,0) size 0x17
    305       RenderBlock (anonymous) at (0,744) size 769x1
    306         RenderInline {SPAN} at (0,0) size 0x0
    307           RenderInline {SPAN} at (0,0) size 0x0
    308             RenderInline {SPAN} at (0,0) size 0x0
    309               RenderInline {SPAN} at (0,0) size 0x0
    310               RenderText {#text} at (0,0) size 0x0
    311       RenderBlock (anonymous) at (0,751) size 769x3
    312         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    313       RenderBlock (anonymous) at (0,760) size 769x1
    314         RenderInline {SPAN} at (0,0) size 0x0
    315           RenderInline {SPAN} at (0,0) size 0x0
    316             RenderInline {SPAN} at (0,0) size 0x0
    317               RenderInline {SPAN} at (0,0) size 0x0
    318                 RenderText {#text} at (0,0) size 0x0
    319       RenderBlock (anonymous) at (0,760) size 769x115
    320         RenderTable {TABLE} at (0,0) size 614x114
    321           RenderTableSection {TBODY} at (0,0) size 614x114
    322             RenderTableRow {TR} at (0,2) size 614x110
     305      RenderBlock (anonymous) at (0,755) size 769x1
     306        RenderInline {SPAN} at (0,0) size 0x0
     307          RenderInline {SPAN} at (0,0) size 0x0
     308            RenderInline {SPAN} at (0,0) size 0x0
     309              RenderInline {SPAN} at (0,0) size 0x0
     310              RenderText {#text} at (0,0) size 0x0
     311      RenderBlock (anonymous) at (0,762) size 769x3
     312        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     313      RenderBlock (anonymous) at (0,771) size 769x1
     314        RenderInline {SPAN} at (0,0) size 0x0
     315          RenderInline {SPAN} at (0,0) size 0x0
     316            RenderInline {SPAN} at (0,0) size 0x0
     317              RenderInline {SPAN} at (0,0) size 0x0
     318                RenderText {#text} at (0,0) size 0x0
     319      RenderBlock (anonymous) at (0,771) size 769x115
     320        RenderTable {TABLE} at (0,0) size 618x114
     321          RenderTableSection {TBODY} at (0,0) size 618x114
     322            RenderTableRow {TR} at (0,2) size 618x110
    323323              RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
    324324              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    325               RenderTableCell {TD} at (10,47) size 90x19 [r=0 c=2 rs=1 cs=1]
    326                 RenderImage {IMG} at (1,1) size 88x17
    327                 RenderText {#text} at (0,0) size 0x0
    328               RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
     325              RenderTableCell {TD} at (10,45) size 94x23 [r=0 c=2 rs=1 cs=1]
     326                RenderImage {IMG} at (1,1) size 92x21
     327                RenderText {#text} at (0,0) size 0x0
     328              RenderTableCell {TD} at (106,2) size 510x110 [r=0 c=3 rs=1 cs=1]
    329329                RenderText {#text} at (1,1) size 24x17
    330330                  text run at (1,1) width 24: "Air "
    … …  
    356356                      text run at (241,91) width 4: " "
    357357                    RenderBR {BR} at (245,105) size 0x0
    358       RenderBlock (anonymous) at (0,874) size 769x1
    359         RenderInline {SPAN} at (0,0) size 0x0
    360           RenderInline {SPAN} at (0,0) size 0x0
    361             RenderInline {SPAN} at (0,0) size 0x0
    362               RenderInline {SPAN} at (0,0) size 0x0
    363               RenderText {#text} at (0,0) size 0x0
    364       RenderBlock (anonymous) at (0,880) size 769x3
    365         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    366       RenderBlock (anonymous) at (0,889) size 769x49
     358      RenderBlock (anonymous) at (0,885) size 769x1
     359        RenderInline {SPAN} at (0,0) size 0x0
     360          RenderInline {SPAN} at (0,0) size 0x0
     361            RenderInline {SPAN} at (0,0) size 0x0
     362              RenderInline {SPAN} at (0,0) size 0x0
     363              RenderText {#text} at (0,0) size 0x0
     364      RenderBlock (anonymous) at (0,891) size 769x3
     365        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     366      RenderBlock (anonymous) at (0,900) size 769x49
    367367        RenderInline {SPAN} at (0,0) size 196x46
    368368          RenderInline {SPAN} at (0,0) size 0x0
    … …  
    385385            RenderBR {BR} at (196,45) size 0x0
    386386          RenderText {#text} at (0,0) size 0x0
    387       RenderBlock (anonymous) at (0,944) size 769x3
    388         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    389       RenderBlock (anonymous) at (0,952) size 769x19
    390         RenderInline {SPAN} at (0,0) size 182x15
    391           RenderInline {SPAN} at (0,0) size 182x17
    392             RenderText {#text} at (0,0) size 0x0
    393             RenderImage {IMG} at (0,1) size 62x17
    394             RenderText {#text} at (62,0) size 4x17
    395               text run at (62,0) width 4: " "
     387      RenderBlock (anonymous) at (0,955) size 769x3
     388        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     389      RenderBlock (anonymous) at (0,963) size 769x22
     390        RenderInline {SPAN} at (0,0) size 186x15
     391          RenderInline {SPAN} at (0,0) size 186x17
     392            RenderText {#text} at (0,0) size 0x0
     393            RenderImage {IMG} at (0,0) size 66x21
     394            RenderText {#text} at (66,1) size 4x17
     395              text run at (66,1) width 4: " "
    396396            RenderInline {B} at (0,0) size 112x17
    397               RenderText {#text} at (66,0) size 112x17
    398                 text run at (66,0) width 112: "Web Bookings"
    399             RenderText {#text} at (178,0) size 4x17
    400               text run at (178,0) width 4: " "
     397              RenderText {#text} at (70,1) size 112x17
     398                text run at (70,1) width 112: "Web Bookings"
     399            RenderText {#text} at (182,1) size 4x17
     400              text run at (182,1) width 4: " "
    401401            RenderInline {SPAN} at (0,0) size 0x17
    402               RenderBR {BR} at (182,14) size 0x0
    403               RenderInline {SPAN} at (0,0) size 0x0
    404             RenderText {#text} at (0,0) size 0x0
    405           RenderText {#text} at (0,0) size 0x0
    406       RenderBlock (anonymous) at (0,977) size 769x3
    407         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    408       RenderBlock (anonymous) at (0,986) size 769x19
     402              RenderBR {BR} at (186,15) size 0x0
     403              RenderInline {SPAN} at (0,0) size 0x0
     404            RenderText {#text} at (0,0) size 0x0
     405          RenderText {#text} at (0,0) size 0x0
     406      RenderBlock (anonymous) at (0,991) size 769x3
     407        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     408      RenderBlock (anonymous) at (0,1000) size 769x19
    409409        RenderInline {SPAN} at (0,0) size 261x15
    410410          RenderInline {SPAN} at (0,0) size 261x15
    … …  
    419419            RenderText {#text} at (0,0) size 0x0
    420420            RenderText {#text} at (0,0) size 0x0
    421       RenderBlock (anonymous) at (0,1010) size 769x32
     421      RenderBlock (anonymous) at (0,1024) size 769x32
    422422        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    423423        RenderBlock {P} at (0,15) size 769x16
    … …  
    428428              text run at (204,0) width 163: "Click here for latest updates"
    429429          RenderText {#text} at (0,0) size 0x0
    430       RenderBlock (anonymous) at (0,1054) size 769x1
     430      RenderBlock (anonymous) at (0,1068) size 769x1
    431431        RenderInline {SPAN} at (0,0) size 0x0
    432432          RenderInline {SPAN} at (0,0) size 0x0
    … …  
    437437    RenderInline {SPAN} at (0,0) size 88x15
    438438      RenderText {#text} at (0,0) size 0x0
    439       RenderImage {IMG} at (0,26) size 4x4
    440       RenderText {#text} at (4,18) size 4x15
    441         text run at (4,18) width 4: " "
     439      RenderImage {IMG} at (0,29) size 4x4
     440      RenderText {#text} at (4,21) size 4x15
     441        text run at (4,21) width 4: " "
    442442      RenderInline {SPAN} at (0,0) size 80x15
    443         RenderText {#text} at (8,18) size 80x15
    444           text run at (8,18) width 80: "HAO, SCOTT"
    445         RenderBR {BR} at (88,30) size 0x0
     443        RenderText {#text} at (8,21) size 80x15
     444          text run at (8,21) width 80: "HAO, SCOTT"
     445        RenderBR {BR} at (88,33) size 0x0
    446446        RenderText {#text} at (0,0) size 0x0
    447447      RenderText {#text} at (0,0) size 0x0
    448448    RenderText {#text} at (0,0) size 0x0
    449 layer at (23,92) size 576x30
     449layer at (23,95) size 576x30
    450450  RenderInline (relative positioned) {SPAN} at (0,0) size 576x30
    451451    RenderText {#text} at (0,0) size 0x0
    452     RenderImage {IMG} at (0,26) size 4x4
    453     RenderText {#text} at (4,18) size 572x15
    454       text run at (4,18) width 4: " "
    455       text run at (8,18) width 56: "Address: "
    456       text run at (64,18) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
    457     RenderBR {BR} at (576,30) size 0x0
    458     RenderImage {IMG} at (0,41) size 4x4
    459     RenderText {#text} at (4,33) size 409x15
    460       text run at (4,33) width 4: " "
    461       text run at (8,33) width 48: "Deliver: "
    462       text run at (56,33) width 104: "DEBI STANGEL, "
    463       text run at (160,33) width 117: "119 GLEN COURT, "
    464       text run at (277,33) width 136: "DANVILLE CA Z/94526"
    465 layer at (23,155) size 4x15
     452    RenderImage {IMG} at (0,28) size 4x4
     453    RenderText {#text} at (4,20) size 572x15
     454      text run at (4,20) width 4: " "
     455      text run at (8,20) width 56: "Address: "
     456      text run at (64,20) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
     457    RenderBR {BR} at (576,32) size 0x0
     458    RenderImage {IMG} at (0,43) size 4x4
     459    RenderText {#text} at (4,35) size 409x15
     460      text run at (4,35) width 4: " "
     461      text run at (8,35) width 48: "Deliver: "
     462      text run at (56,35) width 104: "DEBI STANGEL, "
     463      text run at (160,35) width 117: "119 GLEN COURT, "
     464      text run at (277,35) width 136: "DANVILLE CA Z/94526"
     465layer at (23,160) size 4x15
    466466  RenderInline (relative positioned) {SPAN} at (0,0) size 4x15
    467467    RenderText {#text} at (0,0) size 0x0
    468     RenderImage {IMG} at (0,18) size 4x4
     468    RenderImage {IMG} at (0,21) size 4x4
    469469    RenderText {#text} at (0,0) size 0x0
    470 layer at (23,177) size 769x60
    471   RenderBlock (anonymous) at (0,168) size 769x61
    472 layer at (43,162) size 529x60
     470layer at (23,185) size 769x60
     471  RenderBlock (anonymous) at (0,176) size 769x61
     472layer at (43,170) size 529x60
    473473  RenderTable {TABLE} at (0,0) size 529x60 [border: (1px outset #808080)]
    474474    RenderTableSection {TBODY} at (1,1) size 527x58

  • trunk/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.txt

    r140253 r147492  
    1 layer at (0,0) size 792x1062
     1layer at (0,0) size 792x1076
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 785x1062
    4   RenderBlock {HTML} at (0,0) size 785x1063
    5     RenderBody {BODY} at (8,8) size 769x1042 [bgcolor=#EEEEEE]
     3layer at (0,0) size 785x1076
     4  RenderBlock {HTML} at (0,0) size 785x1077
     5    RenderBody {BODY} at (8,8) size 769x1056 [bgcolor=#EEEEEE]
    66      RenderBlock (anonymous) at (0,0) size 769x20
    77        RenderInline {SPAN} at (0,0) size 191x15
    … …  
    2424      RenderBlock (anonymous) at (0,26) size 769x3
    2525        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    26       RenderBlock (anonymous) at (0,35) size 769x34
    27         RenderInline {SPAN} at (0,0) size 110x31
    28           RenderInline {SPAN} at (0,0) size 110x31
    29             RenderText {#text} at (0,0) size 0x0
    30             RenderInline {SPAN} at (0,0) size 110x17
    31               RenderText {#text} at (0,0) size 0x0
    32               RenderImage {IMG} at (0,1) size 53x17
    33               RenderText {#text} at (53,0) size 57x17
    34                 text run at (53,0) width 4: " "
    35                 text run at (57,0) width 53: "Names"
    36               RenderBR {BR} at (110,14) size 0x0
     26      RenderBlock (anonymous) at (0,35) size 769x37
     27        RenderInline {SPAN} at (0,0) size 114x33
     28          RenderInline {SPAN} at (0,0) size 114x33
     29            RenderText {#text} at (0,0) size 0x0
     30            RenderInline {SPAN} at (0,0) size 114x17
     31              RenderText {#text} at (0,0) size 0x0
     32              RenderImage {IMG} at (0,0) size 57x21
     33              RenderText {#text} at (57,1) size 57x17
     34                text run at (57,1) width 4: " "
     35                text run at (61,1) width 53: "Names"
     36              RenderBR {BR} at (114,15) size 0x0
    3737            RenderText {#text} at (0,0) size 0x0
    3838            RenderInline {SPAN} at (0,0) size 88x15
    … …  
    4141            RenderText {#text} at (0,0) size 0x0
    4242          RenderText {#text} at (0,0) size 0x0
    43       RenderBlock (anonymous) at (0,74) size 769x3
    44         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    45       RenderBlock (anonymous) at (0,83) size 769x49
    46         RenderInline {SPAN} at (0,0) size 576x46
    47           RenderInline {SPAN} at (0,0) size 576x46
    48             RenderText {#text} at (0,0) size 0x0
    49             RenderImage {IMG} at (0,3) size 62x15
    50             RenderText {#text} at (62,2) size 4x15
    51               text run at (62,2) width 4: " "
     43      RenderBlock (anonymous) at (0,77) size 769x3
     44        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     45      RenderBlock (anonymous) at (0,86) size 769x51
     46        RenderInline {SPAN} at (0,0) size 576x48
     47          RenderInline {SPAN} at (0,0) size 576x48
     48            RenderText {#text} at (0,0) size 0x0
     49            RenderImage {IMG} at (0,1) size 66x19
     50            RenderText {#text} at (66,2) size 4x15
     51              text run at (66,2) width 4: " "
    5252            RenderInline {SPAN} at (0,0) size 83x17
    53               RenderText {#text} at (66,0) size 83x17
    54                 text run at (66,0) width 83: "Addresses"
    55               RenderBR {BR} at (149,14) size 0x0
    56             RenderText {#text} at (0,0) size 0x0
    57             RenderText {#text} at (0,0) size 0x0
    58           RenderText {#text} at (0,0) size 0x0
    59       RenderBlock (anonymous) at (0,138) size 769x3
    60         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    61       RenderBlock (anonymous) at (0,146) size 769x23
    62         RenderInline {SPAN} at (0,0) size 126x23
    63           RenderInline {SPAN} at (0,0) size 126x23
    64             RenderText {#text} at (0,0) size 0x0
    65             RenderInline {SPAN} at (0,0) size 126x17
    66               RenderText {#text} at (0,0) size 0x0
    67               RenderImage {IMG} at (0,1) size 59x17
    68               RenderText {#text} at (59,0) size 67x17
    69                 text run at (59,0) width 4: " "
    70                 text run at (63,0) width 63: "Phones "
    71               RenderBR {BR} at (126,14) size 0x0
    72             RenderText {#text} at (0,0) size 0x0
    73       RenderBlock (anonymous) at (0,228) size 769x1
    74         RenderInline {SPAN} at (0,0) size 0x0
    75           RenderInline {SPAN} at (0,0) size 0x0
    76             RenderText {#text} at (0,0) size 0x0
    77           RenderText {#text} at (0,0) size 0x0
    78       RenderBlock (anonymous) at (0,235) size 769x3
    79         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    80       RenderBlock (anonymous) at (0,244) size 769x19
    81         RenderInline {SPAN} at (0,0) size 128x15
    82           RenderInline {SPAN} at (0,0) size 128x15
    83             RenderText {#text} at (0,0) size 0x0
    84             RenderInline {SPAN} at (0,0) size 128x17
    85               RenderText {#text} at (0,0) size 0x0
    86               RenderImage {IMG} at (0,1) size 62x17
    87               RenderText {#text} at (62,0) size 66x17
    88                 text run at (62,0) width 4: " "
    89                 text run at (66,0) width 62: "Itinerary"
    90             RenderText {#text} at (0,0) size 0x0
    91             RenderInline {SPAN} at (0,0) size 0x0
    92               RenderText {#text} at (0,0) size 0x0
    93               RenderInline {SPAN} at (0,0) size 0x0
    94                 RenderText {#text} at (0,0) size 0x0
    95       RenderBlock (anonymous) at (0,262) size 769x61
    96         RenderTable {TABLE} at (0,0) size 581x60
    97           RenderTableSection {TBODY} at (0,0) size 581x60
    98             RenderTableRow {TR} at (0,2) size 581x56
     53              RenderText {#text} at (70,0) size 83x17
     54                text run at (70,0) width 83: "Addresses"
     55              RenderBR {BR} at (153,14) size 0x0
     56            RenderText {#text} at (0,0) size 0x0
     57            RenderText {#text} at (0,0) size 0x0
     58          RenderText {#text} at (0,0) size 0x0
     59      RenderBlock (anonymous) at (0,143) size 769x3
     60        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     61      RenderBlock (anonymous) at (0,151) size 769x26
     62        RenderInline {SPAN} at (0,0) size 130x25
     63          RenderInline {SPAN} at (0,0) size 130x25
     64            RenderText {#text} at (0,0) size 0x0
     65            RenderInline {SPAN} at (0,0) size 130x17
     66              RenderText {#text} at (0,0) size 0x0
     67              RenderImage {IMG} at (0,0) size 63x21
     68              RenderText {#text} at (63,1) size 67x17
     69                text run at (63,1) width 4: " "
     70                text run at (67,1) width 63: "Phones "
     71              RenderBR {BR} at (130,15) size 0x0
     72            RenderText {#text} at (0,0) size 0x0
     73      RenderBlock (anonymous) at (0,236) size 769x1
     74        RenderInline {SPAN} at (0,0) size 0x0
     75          RenderInline {SPAN} at (0,0) size 0x0
     76            RenderText {#text} at (0,0) size 0x0
     77          RenderText {#text} at (0,0) size 0x0
     78      RenderBlock (anonymous) at (0,243) size 769x3
     79        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     80      RenderBlock (anonymous) at (0,252) size 769x22
     81        RenderInline {SPAN} at (0,0) size 132x15
     82          RenderInline {SPAN} at (0,0) size 132x15
     83            RenderText {#text} at (0,0) size 0x0
     84            RenderInline {SPAN} at (0,0) size 132x17
     85              RenderText {#text} at (0,0) size 0x0
     86              RenderImage {IMG} at (0,0) size 66x21
     87              RenderText {#text} at (66,1) size 66x17
     88                text run at (66,1) width 4: " "
     89                text run at (70,1) width 62: "Itinerary"
     90            RenderText {#text} at (0,0) size 0x0
     91            RenderInline {SPAN} at (0,0) size 0x0
     92              RenderText {#text} at (0,0) size 0x0
     93              RenderInline {SPAN} at (0,0) size 0x0
     94                RenderText {#text} at (0,0) size 0x0
     95      RenderBlock (anonymous) at (0,273) size 769x61
     96        RenderTable {TABLE} at (0,0) size 585x60
     97          RenderTableSection {TBODY} at (0,0) size 585x60
     98            RenderTableRow {TR} at (0,2) size 585x56
    9999              RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
    100100              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    101               RenderTableCell {TD} at (10,20) size 149x19 [r=0 c=2 rs=1 cs=1]
    102                 RenderImage {IMG} at (1,1) size 147x17
    103                 RenderText {#text} at (0,0) size 0x0
    104               RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
     101              RenderTableCell {TD} at (10,18) size 153x23 [r=0 c=2 rs=1 cs=1]
     102                RenderImage {IMG} at (1,1) size 151x21
     103                RenderText {#text} at (0,0) size 0x0
     104              RenderTableCell {TD} at (165,2) size 418x56 [r=0 c=3 rs=1 cs=1]
    105105                RenderText {#text} at (1,1) size 147x17
    106106                  text run at (1,1) width 147: "TUR - Tour Package"
    … …  
    111111                RenderText {#text} at (1,37) size 416x17
    112112                  text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
    113       RenderBlock (anonymous) at (0,322) size 769x1
    114         RenderInline {SPAN} at (0,0) size 0x0
    115           RenderInline {SPAN} at (0,0) size 0x0
    116             RenderInline {SPAN} at (0,0) size 0x0
    117               RenderInline {SPAN} at (0,0) size 0x0
    118               RenderText {#text} at (0,0) size 0x0
    119       RenderBlock (anonymous) at (0,328) size 769x3
    120         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    121       RenderBlock (anonymous) at (0,337) size 769x1
    122         RenderInline {SPAN} at (0,0) size 0x0
    123           RenderInline {SPAN} at (0,0) size 0x0
    124             RenderInline {SPAN} at (0,0) size 0x0
    125               RenderInline {SPAN} at (0,0) size 0x0
    126                 RenderText {#text} at (0,0) size 0x0
    127       RenderBlock (anonymous) at (0,337) size 769x197
    128         RenderTable {TABLE} at (0,0) size 710x196
    129           RenderTableSection {TBODY} at (0,0) size 710x196
    130             RenderTableRow {TR} at (0,2) size 710x192
     113      RenderBlock (anonymous) at (0,333) size 769x1
     114        RenderInline {SPAN} at (0,0) size 0x0
     115          RenderInline {SPAN} at (0,0) size 0x0
     116            RenderInline {SPAN} at (0,0) size 0x0
     117              RenderInline {SPAN} at (0,0) size 0x0
     118              RenderText {#text} at (0,0) size 0x0
     119      RenderBlock (anonymous) at (0,339) size 769x3
     120        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     121      RenderBlock (anonymous) at (0,348) size 769x1
     122        RenderInline {SPAN} at (0,0) size 0x0
     123          RenderInline {SPAN} at (0,0) size 0x0
     124            RenderInline {SPAN} at (0,0) size 0x0
     125              RenderInline {SPAN} at (0,0) size 0x0
     126                RenderText {#text} at (0,0) size 0x0
     127      RenderBlock (anonymous) at (0,348) size 769x197
     128        RenderTable {TABLE} at (0,0) size 714x196
     129          RenderTableSection {TBODY} at (0,0) size 714x196
     130            RenderTableRow {TR} at (0,2) size 714x192
    131131              RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
    132132              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    133               RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
    134                 RenderImage {IMG} at (1,1) size 88x17
    135                 RenderText {#text} at (0,0) size 0x0
    136               RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
     133              RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
     134                RenderImage {IMG} at (1,1) size 92x21
     135                RenderText {#text} at (0,0) size 0x0
     136              RenderTableCell {TD} at (106,2) size 606x192 [r=0 c=3 rs=1 cs=1]
    137137                RenderBlock (anonymous) at (1,1) size 604x126
    138138                  RenderText {#text} at (0,0) size 24x17
    … …  
    207207                    RenderInline {SPACE} at (0,0) size 0x17
    208208                      RenderBR {BR} at (0,0) size 0x17
    209       RenderBlock (anonymous) at (0,533) size 769x1
    210         RenderInline {SPAN} at (0,0) size 0x0
    211           RenderInline {SPAN} at (0,0) size 0x0
    212             RenderInline {SPAN} at (0,0) size 0x0
    213               RenderInline {SPAN} at (0,0) size 0x0
    214               RenderText {#text} at (0,0) size 0x0
    215       RenderBlock (anonymous) at (0,540) size 769x3
    216         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    217       RenderBlock (anonymous) at (0,548) size 769x1
    218         RenderInline {SPAN} at (0,0) size 0x0
    219           RenderInline {SPAN} at (0,0) size 0x0
    220             RenderInline {SPAN} at (0,0) size 0x0
    221               RenderInline {SPAN} at (0,0) size 0x0
    222                 RenderText {#text} at (0,0) size 0x0
    223       RenderBlock (anonymous) at (0,548) size 769x197
    224         RenderTable {TABLE} at (0,0) size 599x196
    225           RenderTableSection {TBODY} at (0,0) size 599x196
    226             RenderTableRow {TR} at (0,2) size 599x192
     209      RenderBlock (anonymous) at (0,544) size 769x1
     210        RenderInline {SPAN} at (0,0) size 0x0
     211          RenderInline {SPAN} at (0,0) size 0x0
     212            RenderInline {SPAN} at (0,0) size 0x0
     213              RenderInline {SPAN} at (0,0) size 0x0
     214              RenderText {#text} at (0,0) size 0x0
     215      RenderBlock (anonymous) at (0,551) size 769x3
     216        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     217      RenderBlock (anonymous) at (0,559) size 769x1
     218        RenderInline {SPAN} at (0,0) size 0x0
     219          RenderInline {SPAN} at (0,0) size 0x0
     220            RenderInline {SPAN} at (0,0) size 0x0
     221              RenderInline {SPAN} at (0,0) size 0x0
     222                RenderText {#text} at (0,0) size 0x0
     223      RenderBlock (anonymous) at (0,559) size 769x197
     224        RenderTable {TABLE} at (0,0) size 603x196
     225          RenderTableSection {TBODY} at (0,0) size 603x196
     226            RenderTableRow {TR} at (0,2) size 603x192
    227227              RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
    228228              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    229               RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
    230                 RenderImage {IMG} at (1,1) size 88x17
    231                 RenderText {#text} at (0,0) size 0x0
    232               RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
     229              RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
     230                RenderImage {IMG} at (1,1) size 92x21
     231                RenderText {#text} at (0,0) size 0x0
     232              RenderTableCell {TD} at (106,2) size 495x192 [r=0 c=3 rs=1 cs=1]
    233233                RenderBlock (anonymous) at (1,1) size 493x126
    234234                  RenderText {#text} at (0,0) size 24x17
    … …  
    303303                    RenderInline {SPACE} at (0,0) size 0x17
    304304                      RenderBR {BR} at (0,0) size 0x17
    305       RenderBlock (anonymous) at (0,744) size 769x1
    306         RenderInline {SPAN} at (0,0) size 0x0
    307           RenderInline {SPAN} at (0,0) size 0x0
    308             RenderInline {SPAN} at (0,0) size 0x0
    309               RenderInline {SPAN} at (0,0) size 0x0
    310               RenderText {#text} at (0,0) size 0x0
    311       RenderBlock (anonymous) at (0,751) size 769x3
    312         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    313       RenderBlock (anonymous) at (0,760) size 769x1
    314         RenderInline {SPAN} at (0,0) size 0x0
    315           RenderInline {SPAN} at (0,0) size 0x0
    316             RenderInline {SPAN} at (0,0) size 0x0
    317               RenderInline {SPAN} at (0,0) size 0x0
    318                 RenderText {#text} at (0,0) size 0x0
    319       RenderBlock (anonymous) at (0,760) size 769x115
    320         RenderTable {TABLE} at (0,0) size 614x114
    321           RenderTableSection {TBODY} at (0,0) size 614x114
    322             RenderTableRow {TR} at (0,2) size 614x110
     305      RenderBlock (anonymous) at (0,755) size 769x1
     306        RenderInline {SPAN} at (0,0) size 0x0
     307          RenderInline {SPAN} at (0,0) size 0x0
     308            RenderInline {SPAN} at (0,0) size 0x0
     309              RenderInline {SPAN} at (0,0) size 0x0
     310              RenderText {#text} at (0,0) size 0x0
     311      RenderBlock (anonymous) at (0,762) size 769x3
     312        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     313      RenderBlock (anonymous) at (0,771) size 769x1
     314        RenderInline {SPAN} at (0,0) size 0x0
     315          RenderInline {SPAN} at (0,0) size 0x0
     316            RenderInline {SPAN} at (0,0) size 0x0
     317              RenderInline {SPAN} at (0,0) size 0x0
     318                RenderText {#text} at (0,0) size 0x0
     319      RenderBlock (anonymous) at (0,771) size 769x115
     320        RenderTable {TABLE} at (0,0) size 618x114
     321          RenderTableSection {TBODY} at (0,0) size 618x114
     322            RenderTableRow {TR} at (0,2) size 618x110
    323323              RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
    324324              RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
    325               RenderTableCell {TD} at (10,47) size 90x19 [r=0 c=2 rs=1 cs=1]
    326                 RenderImage {IMG} at (1,1) size 88x17
    327                 RenderText {#text} at (0,0) size 0x0
    328               RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
     325              RenderTableCell {TD} at (10,45) size 94x23 [r=0 c=2 rs=1 cs=1]
     326                RenderImage {IMG} at (1,1) size 92x21
     327                RenderText {#text} at (0,0) size 0x0
     328              RenderTableCell {TD} at (106,2) size 510x110 [r=0 c=3 rs=1 cs=1]
    329329                RenderText {#text} at (1,1) size 24x17
    330330                  text run at (1,1) width 24: "Air "
    … …  
    356356                      text run at (241,91) width 4: " "
    357357                    RenderBR {BR} at (245,105) size 0x0
    358       RenderBlock (anonymous) at (0,874) size 769x1
    359         RenderInline {SPAN} at (0,0) size 0x0
    360           RenderInline {SPAN} at (0,0) size 0x0
    361             RenderInline {SPAN} at (0,0) size 0x0
    362               RenderInline {SPAN} at (0,0) size 0x0
    363               RenderText {#text} at (0,0) size 0x0
    364       RenderBlock (anonymous) at (0,880) size 769x3
    365         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    366       RenderBlock (anonymous) at (0,889) size 769x49
     358      RenderBlock (anonymous) at (0,885) size 769x1
     359        RenderInline {SPAN} at (0,0) size 0x0
     360          RenderInline {SPAN} at (0,0) size 0x0
     361            RenderInline {SPAN} at (0,0) size 0x0
     362              RenderInline {SPAN} at (0,0) size 0x0
     363              RenderText {#text} at (0,0) size 0x0
     364      RenderBlock (anonymous) at (0,891) size 769x3
     365        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     366      RenderBlock (anonymous) at (0,900) size 769x49
    367367        RenderInline {SPAN} at (0,0) size 196x46
    368368          RenderInline {SPAN} at (0,0) size 0x0
    … …  
    385385            RenderBR {BR} at (196,45) size 0x0
    386386          RenderText {#text} at (0,0) size 0x0
    387       RenderBlock (anonymous) at (0,944) size 769x3
    388         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    389       RenderBlock (anonymous) at (0,952) size 769x19
    390         RenderInline {SPAN} at (0,0) size 182x15
    391           RenderInline {SPAN} at (0,0) size 182x17
    392             RenderText {#text} at (0,0) size 0x0
    393             RenderImage {IMG} at (0,1) size 62x17
    394             RenderText {#text} at (62,0) size 4x17
    395               text run at (62,0) width 4: " "
     387      RenderBlock (anonymous) at (0,955) size 769x3
     388        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     389      RenderBlock (anonymous) at (0,963) size 769x22
     390        RenderInline {SPAN} at (0,0) size 186x15
     391          RenderInline {SPAN} at (0,0) size 186x17
     392            RenderText {#text} at (0,0) size 0x0
     393            RenderImage {IMG} at (0,0) size 66x21
     394            RenderText {#text} at (66,1) size 4x17
     395              text run at (66,1) width 4: " "
    396396            RenderInline {B} at (0,0) size 112x17
    397               RenderText {#text} at (66,0) size 112x17
    398                 text run at (66,0) width 112: "Web Bookings"
    399             RenderText {#text} at (178,0) size 4x17
    400               text run at (178,0) width 4: " "
     397              RenderText {#text} at (70,1) size 112x17
     398                text run at (70,1) width 112: "Web Bookings"
     399            RenderText {#text} at (182,1) size 4x17
     400              text run at (182,1) width 4: " "
    401401            RenderInline {SPAN} at (0,0) size 0x17
    402               RenderBR {BR} at (182,14) size 0x0
    403               RenderInline {SPAN} at (0,0) size 0x0
    404             RenderText {#text} at (0,0) size 0x0
    405           RenderText {#text} at (0,0) size 0x0
    406       RenderBlock (anonymous) at (0,977) size 769x3
    407         RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    408       RenderBlock (anonymous) at (0,986) size 769x19
     402              RenderBR {BR} at (186,15) size 0x0
     403              RenderInline {SPAN} at (0,0) size 0x0
     404            RenderText {#text} at (0,0) size 0x0
     405          RenderText {#text} at (0,0) size 0x0
     406      RenderBlock (anonymous) at (0,991) size 769x3
     407        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
     408      RenderBlock (anonymous) at (0,1000) size 769x19
    409409        RenderInline {SPAN} at (0,0) size 261x15
    410410          RenderInline {SPAN} at (0,0) size 261x15
    … …  
    419419            RenderText {#text} at (0,0) size 0x0
    420420            RenderText {#text} at (0,0) size 0x0
    421       RenderBlock (anonymous) at (0,1010) size 769x32
     421      RenderBlock (anonymous) at (0,1024) size 769x32
    422422        RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
    423423        RenderBlock {P} at (0,15) size 769x16
    … …  
    428428              text run at (204,0) width 163: "Click here for latest updates"
    429429          RenderText {#text} at (0,0) size 0x0
    430       RenderBlock (anonymous) at (0,1054) size 769x1
     430      RenderBlock (anonymous) at (0,1068) size 769x1
    431431        RenderInline {SPAN} at (0,0) size 0x0
    432432          RenderInline {SPAN} at (0,0) size 0x0
    … …  
    437437    RenderInline {SPAN} at (0,0) size 88x15
    438438      RenderText {#text} at (0,0) size 0x0
    439       RenderImage {IMG} at (0,26) size 4x4
    440       RenderText {#text} at (4,18) size 4x15
    441         text run at (4,18) width 4: " "
     439      RenderImage {IMG} at (0,29) size 4x4
     440      RenderText {#text} at (4,21) size 4x15
     441        text run at (4,21) width 4: " "
    442442      RenderInline {SPAN} at (0,0) size 80x15
    443         RenderText {#text} at (8,18) size 80x15
    444           text run at (8,18) width 80: "HAO, SCOTT"
    445         RenderBR {BR} at (88,30) size 0x0
     443        RenderText {#text} at (8,21) size 80x15
     444          text run at (8,21) width 80: "HAO, SCOTT"
     445        RenderBR {BR} at (88,33) size 0x0
    446446        RenderText {#text} at (0,0) size 0x0
    447447      RenderText {#text} at (0,0) size 0x0
    448448    RenderText {#text} at (0,0) size 0x0
    449 layer at (23,92) size 576x30
     449layer at (23,95) size 576x30
    450450  RenderInline (relative positioned) {SPAN} at (0,0) size 576x30
    451451    RenderText {#text} at (0,0) size 0x0
    452     RenderImage {IMG} at (0,26) size 4x4
    453     RenderText {#text} at (4,18) size 572x15
    454       text run at (4,18) width 4: " "
    455       text run at (8,18) width 56: "Address: "
    456       text run at (64,18) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
    457     RenderBR {BR} at (576,30) size 0x0
    458     RenderImage {IMG} at (0,41) size 4x4
    459     RenderText {#text} at (4,33) size 409x15
    460       text run at (4,33) width 4: " "
    461       text run at (8,33) width 48: "Deliver: "
    462       text run at (56,33) width 104: "DEBI STANGEL, "
    463       text run at (160,33) width 117: "119 GLEN COURT, "
    464       text run at (277,33) width 136: "DANVILLE CA Z/94526"
    465 layer at (23,155) size 4x15
     452    RenderImage {IMG} at (0,28) size 4x4
     453    RenderText {#text} at (4,20) size 572x15
     454      text run at (4,20) width 4: " "
     455      text run at (8,20) width 56: "Address: "
     456      text run at (64,20) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
     457    RenderBR {BR} at (576,32) size 0x0
     458    RenderImage {IMG} at (0,43) size 4x4
     459    RenderText {#text} at (4,35) size 409x15
     460      text run at (4,35) width 4: " "
     461      text run at (8,35) width 48: "Deliver: "
     462      text run at (56,35) width 104: "DEBI STANGEL, "
     463      text run at (160,35) width 117: "119 GLEN COURT, "
     464      text run at (277,35) width 136: "DANVILLE CA Z/94526"
     465layer at (23,160) size 4x15
    466466  RenderInline (relative positioned) {SPAN} at (0,0) size 4x15
    467467    RenderText {#text} at (0,0) size 0x0
    468     RenderImage {IMG} at (0,18) size 4x4
     468    RenderImage {IMG} at (0,21) size 4x4
    469469    RenderText {#text} at (0,0) size 0x0
    470 layer at (23,177) size 769x60
    471   RenderBlock (anonymous) at (0,168) size 769x61
    472 layer at (43,162) size 529x60
     470layer at (23,185) size 769x60
     471  RenderBlock (anonymous) at (0,176) size 769x61
     472layer at (43,170) size 529x60
    473473  RenderTable {TABLE} at (0,0) size 529x60 [border: (1px outset #808080)]
    474474    RenderTableSection {TBODY} at (1,1) size 527x58

  • trunk/LayoutTests/platform/efl/fast/forms/input-value-expected.txt

    r140149 r147492  
    1 layer at (0,0) size 785x620
     1layer at (0,0) size 785x623
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x620
    4   RenderBlock {HTML} at (0,0) size 785x620
    5     RenderBody {BODY} at (8,8) size 769x596
     3layer at (0,0) size 785x623
     4  RenderBlock {HTML} at (0,0) size 785x623
     5    RenderBody {BODY} at (8,8) size 769x599
    66      RenderBlock {P} at (0,0) size 769x36
    77        RenderText {#text} at (0,0) size 750x35
    … …  
    1212          text run at (0,0) width 713: "Results that match Gecko are like WinIE, but with \"before\" for the attribute in the first two rows and the last row."
    1313      RenderBlock {HR} at (0,86) size 769x2 [border: (1px inset #000000)]
    14       RenderBlock {FORM} at (0,96) size 769x500
    15         RenderTable {TABLE} at (0,0) size 769x500
     14      RenderBlock {FORM} at (0,96) size 769x503
     15        RenderTable {TABLE} at (0,0) size 769x503
    1616          RenderTableSection {THEAD} at (0,0) size 769x24
    1717            RenderTableRow {TR} at (0,2) size 769x20
    … …  
    2828                RenderText {#text} at (1,1) size 59x17
    2929                  text run at (1,1) width 59: "attribute"
    30           RenderTableSection {TBODY} at (0,24) size 769x476
     30          RenderTableSection {TBODY} at (0,24) size 769x479
    3131            RenderTableRow {TR} at (0,2) size 769x34
    3232              RenderTableCell {TD} at (2,9) size 324x20 [r=0 c=0 rs=1 cs=1]
    … …  
    9191                RenderText {#text} at (1,1) size 28x17
    9292                  text run at (1,1) width 28: "after"
    93             RenderTableRow {TR} at (0,166) size 769x20
    94               RenderTableCell {TD} at (2,166) size 324x20 [r=5 c=0 rs=1 cs=1]
     93            RenderTableRow {TR} at (0,166) size 769x23
     94              RenderTableCell {TD} at (2,167) size 324x20 [r=5 c=0 rs=1 cs=1]
    9595                RenderText {#text} at (1,1) size 222x17
    9696                  text run at (1,1) width 222: "image with value property changed"
    97               RenderTableCell {TD} at (328,166) size 312x19 [r=5 c=1 rs=1 cs=1]
    98                 RenderImage {INPUT} at (1,1) size 45x17
    99               RenderTableCell {TD} at (642,166) size 62x20 [r=5 c=2 rs=1 cs=1]
    100                 RenderText {#text} at (1,1) size 28x17
    101                   text run at (1,1) width 28: "after"
    102               RenderTableCell {TD} at (706,166) size 61x20 [r=5 c=3 rs=1 cs=1]
    103                 RenderText {#text} at (1,1) size 28x17
    104                   text run at (1,1) width 28: "after"
    105             RenderTableRow {TR} at (0,188) size 769x20
    106               RenderTableCell {TD} at (2,188) size 324x20 [r=6 c=0 rs=1 cs=1]
     97              RenderTableCell {TD} at (328,166) size 312x23 [r=5 c=1 rs=1 cs=1]
     98                RenderImage {INPUT} at (1,1) size 49x21
     99              RenderTableCell {TD} at (642,167) size 62x20 [r=5 c=2 rs=1 cs=1]
     100                RenderText {#text} at (1,1) size 28x17
     101                  text run at (1,1) width 28: "after"
     102              RenderTableCell {TD} at (706,167) size 61x20 [r=5 c=3 rs=1 cs=1]
     103                RenderText {#text} at (1,1) size 28x17
     104                  text run at (1,1) width 28: "after"
     105            RenderTableRow {TR} at (0,191) size 769x20
     106              RenderTableCell {TD} at (2,191) size 324x20 [r=6 c=0 rs=1 cs=1]
    107107                RenderText {#text} at (1,1) size 216x17
    108108                  text run at (1,1) width 216: "radio with value property changed"
    109               RenderTableCell {TD} at (328,188) size 312x20 [r=6 c=1 rs=1 cs=1]
    110                 RenderBlock {INPUT} at (5,4) size 13x12
    111               RenderTableCell {TD} at (642,188) size 62x20 [r=6 c=2 rs=1 cs=1]
    112                 RenderText {#text} at (1,1) size 28x17
    113                   text run at (1,1) width 28: "after"
    114               RenderTableCell {TD} at (706,188) size 61x20 [r=6 c=3 rs=1 cs=1]
    115                 RenderText {#text} at (1,1) size 28x17
    116                   text run at (1,1) width 28: "after"
    117             RenderTableRow {TR} at (0,210) size 769x34
    118               RenderTableCell {TD} at (2,217) size 324x20 [r=7 c=0 rs=1 cs=1]
     109              RenderTableCell {TD} at (328,191) size 312x20 [r=6 c=1 rs=1 cs=1]
     110                RenderBlock {INPUT} at (5,4) size 13x12
     111              RenderTableCell {TD} at (642,191) size 62x20 [r=6 c=2 rs=1 cs=1]
     112                RenderText {#text} at (1,1) size 28x17
     113                  text run at (1,1) width 28: "after"
     114              RenderTableCell {TD} at (706,191) size 61x20 [r=6 c=3 rs=1 cs=1]
     115                RenderText {#text} at (1,1) size 28x17
     116                  text run at (1,1) width 28: "after"
     117            RenderTableRow {TR} at (0,213) size 769x34
     118              RenderTableCell {TD} at (2,220) size 324x20 [r=7 c=0 rs=1 cs=1]
    119119                RenderText {#text} at (1,1) size 205x17
    120120                  text run at (1,1) width 205: "text with value attribute changed"
    121               RenderTableCell {TD} at (328,210) size 312x34 [r=7 c=1 rs=1 cs=1]
    122                 RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
    123               RenderTableCell {TD} at (642,217) size 62x20 [r=7 c=2 rs=1 cs=1]
    124                 RenderText {#text} at (1,1) size 28x17
    125                   text run at (1,1) width 28: "after"
    126               RenderTableCell {TD} at (706,217) size 61x20 [r=7 c=3 rs=1 cs=1]
    127                 RenderText {#text} at (1,1) size 28x17
    128                   text run at (1,1) width 28: "after"
    129             RenderTableRow {TR} at (0,246) size 769x20
    130               RenderTableCell {TD} at (2,246) size 324x20 [r=8 c=0 rs=1 cs=1]
     121              RenderTableCell {TD} at (328,213) size 312x34 [r=7 c=1 rs=1 cs=1]
     122                RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
     123              RenderTableCell {TD} at (642,220) size 62x20 [r=7 c=2 rs=1 cs=1]
     124                RenderText {#text} at (1,1) size 28x17
     125                  text run at (1,1) width 28: "after"
     126              RenderTableCell {TD} at (706,220) size 61x20 [r=7 c=3 rs=1 cs=1]
     127                RenderText {#text} at (1,1) size 28x17
     128                  text run at (1,1) width 28: "after"
     129            RenderTableRow {TR} at (0,249) size 769x20
     130              RenderTableCell {TD} at (2,249) size 324x20 [r=8 c=0 rs=1 cs=1]
    131131                RenderText {#text} at (1,1) size 247x17
    132132                  text run at (1,1) width 247: "check box with value attribute changed"
    133               RenderTableCell {TD} at (328,246) size 312x20 [r=8 c=1 rs=1 cs=1]
    134                 RenderBlock {INPUT} at (5,4) size 13x12
    135               RenderTableCell {TD} at (642,246) size 62x20 [r=8 c=2 rs=1 cs=1]
    136                 RenderText {#text} at (1,1) size 28x17
    137                   text run at (1,1) width 28: "after"
    138               RenderTableCell {TD} at (706,246) size 61x20 [r=8 c=3 rs=1 cs=1]
    139                 RenderText {#text} at (1,1) size 28x17
    140                   text run at (1,1) width 28: "after"
    141             RenderTableRow {TR} at (0,268) size 769x38
    142               RenderTableCell {TD} at (2,268) size 324x38 [r=9 c=0 rs=1 cs=1]
     133              RenderTableCell {TD} at (328,249) size 312x20 [r=8 c=1 rs=1 cs=1]
     134                RenderBlock {INPUT} at (5,4) size 13x12
     135              RenderTableCell {TD} at (642,249) size 62x20 [r=8 c=2 rs=1 cs=1]
     136                RenderText {#text} at (1,1) size 28x17
     137                  text run at (1,1) width 28: "after"
     138              RenderTableCell {TD} at (706,249) size 61x20 [r=8 c=3 rs=1 cs=1]
     139                RenderText {#text} at (1,1) size 28x17
     140                  text run at (1,1) width 28: "after"
     141            RenderTableRow {TR} at (0,271) size 769x38
     142              RenderTableCell {TD} at (2,271) size 324x38 [r=9 c=0 rs=1 cs=1]
    143143                RenderText {#text} at (1,1) size 314x35
    144144                  text run at (1,1) width 314: "text with value property changed, then turned into"
    145145                  text run at (1,19) width 65: "check box"
    146               RenderTableCell {TD} at (328,277) size 312x20 [r=9 c=1 rs=1 cs=1]
    147                 RenderBlock {INPUT} at (5,4) size 13x12
    148               RenderTableCell {TD} at (642,277) size 62x20 [r=9 c=2 rs=1 cs=1]
    149                 RenderText {#text} at (1,1) size 28x17
    150                   text run at (1,1) width 28: "after"
    151               RenderTableCell {TD} at (706,277) size 61x20 [r=9 c=3 rs=1 cs=1]
    152                 RenderText {#text} at (1,1) size 28x17
    153                   text run at (1,1) width 28: "after"
    154             RenderTableRow {TR} at (0,308) size 769x38
    155               RenderTableCell {TD} at (2,308) size 324x38 [r=10 c=0 rs=1 cs=1]
     146              RenderTableCell {TD} at (328,280) size 312x20 [r=9 c=1 rs=1 cs=1]
     147                RenderBlock {INPUT} at (5,4) size 13x12
     148              RenderTableCell {TD} at (642,280) size 62x20 [r=9 c=2 rs=1 cs=1]
     149                RenderText {#text} at (1,1) size 28x17
     150                  text run at (1,1) width 28: "after"
     151              RenderTableCell {TD} at (706,280) size 61x20 [r=9 c=3 rs=1 cs=1]
     152                RenderText {#text} at (1,1) size 28x17
     153                  text run at (1,1) width 28: "after"
     154            RenderTableRow {TR} at (0,311) size 769x38
     155              RenderTableCell {TD} at (2,311) size 324x38 [r=10 c=0 rs=1 cs=1]
    156156                RenderText {#text} at (1,1) size 284x35
    157157                  text run at (1,1) width 284: "check box with value property changed, then"
    158158                  text run at (1,19) width 95: "turned into text"
    159               RenderTableCell {TD} at (328,310) size 312x34 [r=10 c=1 rs=1 cs=1]
    160                 RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
    161               RenderTableCell {TD} at (642,317) size 62x20 [r=10 c=2 rs=1 cs=1]
    162                 RenderText {#text} at (1,1) size 28x17
    163                   text run at (1,1) width 28: "after"
    164               RenderTableCell {TD} at (706,317) size 61x20 [r=10 c=3 rs=1 cs=1]
    165                 RenderText {#text} at (1,1) size 28x17
    166                   text run at (1,1) width 28: "after"
    167             RenderTableRow {TR} at (0,348) size 769x38
    168               RenderTableCell {TD} at (2,348) size 324x38 [r=11 c=0 rs=1 cs=1]
     159              RenderTableCell {TD} at (328,313) size 312x34 [r=10 c=1 rs=1 cs=1]
     160                RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
     161              RenderTableCell {TD} at (642,320) size 62x20 [r=10 c=2 rs=1 cs=1]
     162                RenderText {#text} at (1,1) size 28x17
     163                  text run at (1,1) width 28: "after"
     164              RenderTableCell {TD} at (706,320) size 61x20 [r=10 c=3 rs=1 cs=1]
     165                RenderText {#text} at (1,1) size 28x17
     166                  text run at (1,1) width 28: "after"
     167            RenderTableRow {TR} at (0,351) size 769x38
     168              RenderTableCell {TD} at (2,351) size 324x38 [r=11 c=0 rs=1 cs=1]
    169169                RenderText {#text} at (1,1) size 312x35
    170170                  text run at (1,1) width 312: "text with value attribute changed, then turned into"
    171171                  text run at (1,19) width 65: "check box"
    172               RenderTableCell {TD} at (328,357) size 312x20 [r=11 c=1 rs=1 cs=1]
    173                 RenderBlock {INPUT} at (5,4) size 13x12
    174               RenderTableCell {TD} at (642,357) size 62x20 [r=11 c=2 rs=1 cs=1]
    175                 RenderText {#text} at (1,1) size 28x17
    176                   text run at (1,1) width 28: "after"
    177               RenderTableCell {TD} at (706,357) size 61x20 [r=11 c=3 rs=1 cs=1]
    178                 RenderText {#text} at (1,1) size 28x17
    179                   text run at (1,1) width 28: "after"
    180             RenderTableRow {TR} at (0,388) size 769x38
    181               RenderTableCell {TD} at (2,388) size 324x38 [r=12 c=0 rs=1 cs=1]
     172              RenderTableCell {TD} at (328,360) size 312x20 [r=11 c=1 rs=1 cs=1]
     173                RenderBlock {INPUT} at (5,4) size 13x12
     174              RenderTableCell {TD} at (642,360) size 62x20 [r=11 c=2 rs=1 cs=1]
     175                RenderText {#text} at (1,1) size 28x17
     176                  text run at (1,1) width 28: "after"
     177              RenderTableCell {TD} at (706,360) size 61x20 [r=11 c=3 rs=1 cs=1]
     178                RenderText {#text} at (1,1) size 28x17
     179                  text run at (1,1) width 28: "after"
     180            RenderTableRow {TR} at (0,391) size 769x38
     181              RenderTableCell {TD} at (2,391) size 324x38 [r=12 c=0 rs=1 cs=1]
    182182                RenderText {#text} at (1,1) size 282x35
    183183                  text run at (1,1) width 282: "check box with value attribute changed, then"
    184184                  text run at (1,19) width 95: "turned into text"
    185               RenderTableCell {TD} at (328,390) size 312x34 [r=12 c=1 rs=1 cs=1]
    186                 RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
    187               RenderTableCell {TD} at (642,397) size 62x20 [r=12 c=2 rs=1 cs=1]
    188                 RenderText {#text} at (1,1) size 28x17
    189                   text run at (1,1) width 28: "after"
    190               RenderTableCell {TD} at (706,397) size 61x20 [r=12 c=3 rs=1 cs=1]
    191                 RenderText {#text} at (1,1) size 28x17
    192                   text run at (1,1) width 28: "after"
    193             RenderTableRow {TR} at (0,428) size 769x46
    194               RenderTableCell {TD} at (2,441) size 324x20 [r=13 c=0 rs=1 cs=1]
     185              RenderTableCell {TD} at (328,393) size 312x34 [r=12 c=1 rs=1 cs=1]
     186                RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
     187              RenderTableCell {TD} at (642,400) size 62x20 [r=12 c=2 rs=1 cs=1]
     188                RenderText {#text} at (1,1) size 28x17
     189                  text run at (1,1) width 28: "after"
     190              RenderTableCell {TD} at (706,400) size 61x20 [r=12 c=3 rs=1 cs=1]
     191                RenderText {#text} at (1,1) size 28x17
     192                  text run at (1,1) width 28: "after"
     193            RenderTableRow {TR} at (0,431) size 769x46
     194              RenderTableCell {TD} at (2,444) size 324x20 [r=13 c=0 rs=1 cs=1]
    195195                RenderText {#text} at (1,1) size 204x17
    196196                  text run at (1,1) width 204: "file with value property changed"
    197               RenderTableCell {TD} at (328,428) size 312x46 [r=13 c=1 rs=1 cs=1]
     197              RenderTableCell {TD} at (328,431) size 312x46 [r=13 c=1 rs=1 cs=1]
    198198                RenderFileUploadControl {INPUT} at (3,3) size 306x40 "No file selected"
    199199                  RenderButton {INPUT} at (0,0) size 121x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
    … …  
    201201                      RenderText at (0,0) size 87x17
    202202                        text run at (0,0) width 87: "Choose File"
    203               RenderTableCell {TD} at (642,450) size 62x2 [r=13 c=2 rs=1 cs=1]
    204               RenderTableCell {TD} at (706,441) size 61x20 [r=13 c=3 rs=1 cs=1]
     203              RenderTableCell {TD} at (642,453) size 62x2 [r=13 c=2 rs=1 cs=1]
     204              RenderTableCell {TD} at (706,444) size 61x20 [r=13 c=3 rs=1 cs=1]
    205205                RenderText {#text} at (1,1) size 40x17
    206206                  text run at (1,1) width 40: "before"
    … …  
    213213    RenderText {#text} at (0,0) size 36x17
    214214      text run at (0,0) width 36: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
    215 layer at (343,347) size 185x18
     215layer at (343,350) size 185x18
    216216  RenderBlock {DIV} at (4,6) size 185x18
    217217    RenderText {#text} at (0,0) size 31x17
    218218      text run at (0,0) width 31: "after"
    219 layer at (343,447) size 185x18
     219layer at (343,450) size 185x18
    220220  RenderBlock {DIV} at (4,6) size 185x18
    221221    RenderText {#text} at (0,0) size 31x17
    222222      text run at (0,0) width 31: "after"
    223 layer at (343,527) size 185x18
     223layer at (343,530) size 185x18
    224224  RenderBlock {DIV} at (4,6) size 185x18
    225225    RenderText {#text} at (0,0) size 31x17

  • trunk/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt

    r140152 r147492  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (8,8) size 784x576
    6       RenderBlock {DIV} at (0,0) size 190x21
    7         RenderBlock {UL} at (0,0) size 190x21
    8           RenderListItem {LI} at (40,0) size 150x21
     6      RenderBlock {DIV} at (0,0) size 190x25
     7        RenderBlock {UL} at (0,0) size 190x25
     8          RenderListItem {LI} at (40,0) size 150x25
    99            RenderListMarker at (0,0) size 7x17: bullet
    10             RenderInline {A} at (0,0) size 197x17
     10            RenderInline {A} at (0,0) size 201x17
    1111              RenderText {#text} at (0,0) size 0x0
    12               RenderImage {IMG} at (0,0) size 197x17
     12              RenderImage {IMG} at (0,0) size 201x21
    1313            RenderText {#text} at (0,0) size 0x0

  • trunk/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt

    r140247 r147492  
    1 layer at (0,0) size 785x659
     1layer at (0,0) size 785x663
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x659
    4   RenderBlock {HTML} at (0,0) size 785x659
    5     RenderBody {BODY} at (8,16) size 769x627
     3layer at (0,0) size 785x663
     4  RenderBlock {HTML} at (0,0) size 785x663
     5    RenderBody {BODY} at (8,16) size 769x631
    66      RenderBlock {P} at (0,0) size 769x54
    77        RenderText {#text} at (0,0) size 752x53
    … …  
    9090              RenderText {#text} at (17,17) size 16x17
    9191                text run at (17,17) width 16: "15"
    92       RenderBlock {P} at (0,440) size 769x53
     92      RenderBlock {P} at (0,440) size 769x57
    9393        RenderText {#text} at (0,0) size 357x17
    9494          text run at (0,0) width 357: "This is an example rendering for the previous table from "
    … …  
    100100          text run at (68,18) width 8: ": "
    101101        RenderBR {BR} at (0,0) size 0x0
    102         RenderImage {IMG} at (0,36) size 213x17
     102        RenderImage {IMG} at (0,36) size 217x21
    103103        RenderText {#text} at (0,0) size 0x0
    104       RenderBlock {P} at (0,509) size 769x36
     104      RenderBlock {P} at (0,513) size 769x36
    105105        RenderText {#text} at (0,0) size 755x35
    106106          text run at (0,0) width 493: "Following table should have 2px solid black line between rows. There should "
    … …  
    112112        RenderText {#text} at (325,18) size 4x17
    113113          text run at (325,18) width 4: "."
    114       RenderTable {TABLE} at (0,561) size 150x66 [border: (1px none #808080)]
     114      RenderTable {TABLE} at (0,565) size 150x66 [border: (1px none #808080)]
    115115        RenderTableSection {TBODY} at (0,1) size 150x65
    116116          RenderTableRow {TR} at (0,0) size 150x22 [border: (2px solid #000000) none]

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r147466 r147492  
    12671267webkit.org/b/39725 fast/events/drag-and-drop-autoscroll.html [ Skip ]
    12681268
     1269# Needs rebaseline.
     1270webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
     1271webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
     1272webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
     1273webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
     1274webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
     1275webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
     1276
    12691277# Leaking state into the next test.
    12701278webkit.org/b/85522 http/tests/security/sandboxed-iframe-form-top.html [ Skip ]

  • trunk/LayoutTests/platform/mac/TestExpectations

    r147466 r147492  
    14031403webkit.org/b/106415 fast/workers/worker-lifecycle.html [ Pass Failure ]
    14041404
     1405# Needs rebaseline.
     1406webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
     1407webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
     1408webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
     1409webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
     1410webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
     1411webkit.org/b/94198 fast/lists/inlineBoxWrapperNullCheck.html [ Failure ]
     1412webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
     1413
    14051414# Spellchecker behavior tests.
    14061415webkit.org/b/108370 editing/spelling/spelling-double-clicked-word.html [ Skip ]

  • trunk/LayoutTests/platform/qt/TestExpectations

    r147466 r147492  
    25592559webkit.org/b/99306 css3/filters/effect-blur-hw.html [ ImageOnlyFailure ] # Blur effect radius is too small on WebKit1, the effect not applied at all on WebKit2.
    25602560
     2561# Needs rebaseline.
     2562webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
     2563webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
     2564webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
     2565webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
     2566webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
     2567webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
     2568
    25612569# REGRESSION(r132143): It made fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html flakey
    25622570webkit.org/b/100117 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html

  • trunk/LayoutTests/platform/win/TestExpectations

    r147466 r147492  
    25112511fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html
    25122512
     2513# Needs rebaseline.
     2514webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
     2515webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
     2516webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
     2517webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
     2518webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
     2519webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
     2520
    25132521# ACCELERATED_OVERFLOW_SCROLLING is disabled on Windows
    25142522compositing/overflow/scrolling-without-painting.html

  • trunk/Source/WebCore/ChangeLog

    r147491 r147492  
     12013-04-02  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        fast/dom/HTMLImageElement/image-alt-text.html and fast/dom/HTMLInputElement/input-image-alt-text.html are failing
     4        https://bugs.webkit.org/show_bug.cgi?id=94198
     5
     6        Reviewed by Darin Adler.
     7
     8        Fix alt text not being displayed for img elements or input of type
     9        "image" due to insufficient size. imageSizeForError() was adding
     10        padding for the alt text but setImageSizeForAltText() was not. The
     11        issue was occurring in paintReplaced() because the contentWidth() /
     12        contentHeight() would be exactly the same size as the alt text.
     13        However, paintReplaced() first draws an outline rect where the
     14        image should be and then reduces the usable width / height for the
     15        alt text by 2 so that the text does not get printed over the rect
     16        borders. However, after decreasing the usable width / height, there
     17        is no longer enough space to draw the text.
     18
     19        No new tests, already covered by existing tests.
     20
     21        * rendering/RenderImage.cpp:
     22        (WebCore::RenderImage::setImageSizeForAltText): Add padding to the text size
     23        so that the alt text can still be drawn, despite the outline rect
     24        borders. Such padding was already used in imageSizeForError(). Also use
     25        ceilf() for the value returned by Font::width() instead of truncating it.
     26        This is needed because we need to fit the whole text in the image and this
     27        may not be the case if we truncate.
     28        (WebCore::RenderImage::paintReplaced):
     29
    1302013-04-02  Raymond Toy  <rtoy@google.com>
    231

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r146955 r147492  
    128128
    129129        const Font& font = style()->font();
    130         IntSize textSize(min(font.width(RenderBlock::constructTextRun(this, font, m_altText, style())), maxAltTextWidth), min(font.fontMetrics().height(), maxAltTextHeight));
    131         imageSize = imageSize.expandedTo(textSize);
     130        IntSize paddedTextSize(paddingWidth + min(ceilf(font.width(RenderBlock::constructTextRun(this, font, m_altText, style()))), maxAltTextWidth), paddingHeight + min(font.fontMetrics().height(), maxAltTextHeight));
     131        imageSize = imageSize.expandedTo(paddedTextSize);
    132132    }
    133133
    … …  
    322322
    323323        if (cWidth > 2 && cHeight > 2) {
     324            const int borderWidth = 1;
     325
    324326            // Draw an outline rect where the image should be.
    325327            context->setStrokeStyle(SolidStroke);
    … …  
    332334            // When calculating the usable dimensions, exclude the pixels of
    333335            // the ouline rect so the error image/alt text doesn't draw on it.
    334             LayoutUnit usableWidth = cWidth - 2;
    335             LayoutUnit usableHeight = cHeight - 2;
     336            LayoutUnit usableWidth = cWidth - 2 * borderWidth;
     337            LayoutUnit usableHeight = cHeight - 2 * borderWidth;
    336338
    337339            RefPtr<Image> image = m_imageResource->image();
    … …  
    351353                if (centerY < 0)
    352354                    centerY = 0;
    353                 imageOffset = LayoutSize(leftBorder + leftPad + centerX + 1, topBorder + topPad + centerY + 1);
     355                imageOffset = LayoutSize(leftBorder + leftPad + centerX + borderWidth, topBorder + topPad + centerY + borderWidth);
    354356                context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, shouldRespectImageOrientation());
    355357                errorPictureDrawn = true;
    … …  
    363365                LayoutUnit ascent = fontMetrics.ascent();
    364366                LayoutPoint altTextOffset = paintOffset;
    365                 altTextOffset.move(leftBorder + leftPad, topBorder + topPad + ascent);
     367                altTextOffset.move(leftBorder + leftPad + (paddingWidth / 2) - borderWidth, topBorder + topPad + ascent + (paddingHeight / 2) - borderWidth);
    366368
    367369                // Only draw the alt text if it'll fit within the content box,
    … …  
    372374                    if (usableWidth >= textWidth && fontMetrics.height() <= imageOffset.height())
    373375                        context->drawText(font, textRun, altTextOffset);
    374                 } else if (usableWidth >= textWidth && cHeight >= fontMetrics.height())
     376                } else if (usableWidth >= textWidth && usableHeight >= fontMetrics.height())
    375377                    context->drawText(font, textRun, altTextOffset);
    376378            }
Note: See TracChangeset for help on using the changeset viewer.