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:
git-svn-id: svn://svn.chromium.org/blink/trunk@147492 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index df4e9a4..9ee412c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,42 @@
+2013-04-02 Christophe Dumez <ch.dumez@sisa.samsung.com>
+
+ 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.
+
+ 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:
+
2013-04-02 Benjamin Poulain <bpoulain@apple.com>
Rebaseline overflowHidden.html's test results after r147245.
diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
index 63946c6..852316c 100644
--- a/LayoutTests/platform/chromium/TestExpectations
+++ b/LayoutTests/platform/chromium/TestExpectations
@@ -3783,6 +3783,22 @@
# Needs rebaseline on all platforms
Bug(leviw) fast/text/shaping/shaping-selection-rect.html [ Failure ]
+# Needs rebaseline.
+webkit.org/b/94198 editing/selection/select-missing-image.html [ Failure ]
+webkit.org/b/94198 fast/block/float/002.html [ Failure ]
+webkit.org/b/94198 fast/block/float/017.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
+webkit.org/b/94198 fast/flexbox/023.html [ Failure ]
+webkit.org/b/94198 fast/flexbox/024.html [ Failure ]
+webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
+webkit.org/b/94198 fast/invalid/012.html [ Failure ]
+webkit.org/b/94198 fast/parser/comment-in-script.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/bugs/bug2997.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
+
# Flaky tests
webkit.org/b/112598 [ Win Mac Linux ] http/tests/security/mixedContent/insecure-audio-video-in-main-frame.html [ Failure Pass ]
webkit.org/b/112601 http/tests/security/cross-frame-access-port-explicit-domain.html [ Failure Pass ]
diff --git a/LayoutTests/platform/efl/fast/block/float/002-expected.png b/LayoutTests/platform/efl/fast/block/float/002-expected.png
index 80cb524..3055940 100644
--- a/LayoutTests/platform/efl/fast/block/float/002-expected.png
+++ b/LayoutTests/platform/efl/fast/block/float/002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/block/float/017-expected.png b/LayoutTests/platform/efl/fast/block/float/017-expected.png
index e0528b0..88501c6 100644
--- a/LayoutTests/platform/efl/fast/block/float/017-expected.png
+++ b/LayoutTests/platform/efl/fast/block/float/017-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png
index c7b9861..8fa2fed 100644
--- a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png
+++ b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt
index 84ff5dc..891c0bd 100644
--- a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt
+++ b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt
@@ -7,10 +7,10 @@
RenderText {#text} at (0,0) size 779x35
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"
text run at (0,18) width 92: "blue rectangle."
- RenderBlock {P} at (0,52) size 784x94
- RenderImage {IMG} at (0,0) size 50x17
- RenderBR {BR} at (50,17) size 0x0
- RenderImage {IMG} at (0,17) size 102x52 [border: (1px solid #000000)]
- RenderBR {BR} at (102,69) size 0x0
- RenderImage {IMG} at (0,69) size 75x25
- RenderBR {BR} at (75,94) size 0x0
+ RenderBlock {P} at (0,52) size 784x98
+ RenderImage {IMG} at (0,0) size 54x21
+ RenderBR {BR} at (54,21) size 0x0
+ RenderImage {IMG} at (0,21) size 102x52 [border: (1px solid #000000)]
+ RenderBR {BR} at (102,73) size 0x0
+ RenderImage {IMG} at (0,73) size 75x25
+ RenderBR {BR} at (75,98) size 0x0
diff --git a/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png b/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png
index d3dc6ab..811b694 100644
--- a/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png
+++ b/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt b/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt
index b7e0d35..1eb7639 100644
--- a/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt
+++ b/LayoutTests/platform/efl/fast/dom/HTMLInputElement/input-image-alt-text-expected.txt
@@ -9,10 +9,10 @@
text run at (481,0) width 267: "no src attribute. You should see \"Success\""
text run at (0,18) width 225: "twice, followed by a blue rectangle."
RenderBlock {P} at (0,52) size 784x0
- RenderBlock {FORM} at (0,52) size 784x94
- RenderImage {INPUT} at (0,0) size 61x17
- RenderBR {BR} at (61,17) size 0x0
- RenderImage {INPUT} at (0,17) size 102x52 [border: (1px solid #000000)]
- RenderBR {BR} at (102,69) size 0x0
- RenderImage {INPUT} at (0,69) size 75x25
- RenderBR {BR} at (75,94) size 0x0
+ RenderBlock {FORM} at (0,52) size 784x98
+ RenderImage {INPUT} at (0,0) size 65x21
+ RenderBR {BR} at (65,21) size 0x0
+ RenderImage {INPUT} at (0,21) size 102x52 [border: (1px solid #000000)]
+ RenderBR {BR} at (102,73) size 0x0
+ RenderImage {INPUT} at (0,73) size 75x25
+ RenderBR {BR} at (75,98) size 0x0
diff --git a/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.png b/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.png
index 028ddfa..ee05823 100644
--- a/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.png
+++ b/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.txt b/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.txt
index c375f9b..7587b34 100644
--- a/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.txt
+++ b/LayoutTests/platform/efl/fast/encoding/utf-16-big-endian-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 792x1062
+layer at (0,0) size 792x1076
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x1062
- RenderBlock {HTML} at (0,0) size 785x1063
- RenderBody {BODY} at (8,8) size 769x1042 [bgcolor=#EEEEEE]
+layer at (0,0) size 785x1076
+ RenderBlock {HTML} at (0,0) size 785x1077
+ RenderBody {BODY} at (8,8) size 769x1056 [bgcolor=#EEEEEE]
RenderBlock (anonymous) at (0,0) size 769x20
RenderInline {SPAN} at (0,0) size 191x15
RenderText {#text} at (0,0) size 0x0
@@ -23,85 +23,85 @@
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,26) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,35) size 769x34
- RenderInline {SPAN} at (0,0) size 110x31
- RenderInline {SPAN} at (0,0) size 110x31
+ RenderBlock (anonymous) at (0,35) size 769x37
+ RenderInline {SPAN} at (0,0) size 114x33
+ RenderInline {SPAN} at (0,0) size 114x33
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 110x17
+ RenderInline {SPAN} at (0,0) size 114x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 53x17
- RenderText {#text} at (53,0) size 57x17
- text run at (53,0) width 4: " "
- text run at (57,0) width 53: "Names"
- RenderBR {BR} at (110,14) size 0x0
+ RenderImage {IMG} at (0,0) size 57x21
+ RenderText {#text} at (57,1) size 57x17
+ text run at (57,1) width 4: " "
+ text run at (61,1) width 53: "Names"
+ RenderBR {BR} at (114,15) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 88x15
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,74) size 769x3
+ RenderBlock (anonymous) at (0,77) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,83) size 769x49
- RenderInline {SPAN} at (0,0) size 576x46
- RenderInline {SPAN} at (0,0) size 576x46
+ RenderBlock (anonymous) at (0,86) size 769x51
+ RenderInline {SPAN} at (0,0) size 576x48
+ RenderInline {SPAN} at (0,0) size 576x48
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,3) size 62x15
- RenderText {#text} at (62,2) size 4x15
- text run at (62,2) width 4: " "
+ RenderImage {IMG} at (0,1) size 66x19
+ RenderText {#text} at (66,2) size 4x15
+ text run at (66,2) width 4: " "
RenderInline {SPAN} at (0,0) size 83x17
- RenderText {#text} at (66,0) size 83x17
- text run at (66,0) width 83: "Addresses"
- RenderBR {BR} at (149,14) size 0x0
+ RenderText {#text} at (70,0) size 83x17
+ text run at (70,0) width 83: "Addresses"
+ RenderBR {BR} at (153,14) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,138) size 769x3
+ RenderBlock (anonymous) at (0,143) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,146) size 769x23
- RenderInline {SPAN} at (0,0) size 126x23
- RenderInline {SPAN} at (0,0) size 126x23
+ RenderBlock (anonymous) at (0,151) size 769x26
+ RenderInline {SPAN} at (0,0) size 130x25
+ RenderInline {SPAN} at (0,0) size 130x25
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 126x17
+ RenderInline {SPAN} at (0,0) size 130x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 59x17
- RenderText {#text} at (59,0) size 67x17
- text run at (59,0) width 4: " "
- text run at (63,0) width 63: "Phones "
- RenderBR {BR} at (126,14) size 0x0
+ RenderImage {IMG} at (0,0) size 63x21
+ RenderText {#text} at (63,1) size 67x17
+ text run at (63,1) width 4: " "
+ text run at (67,1) width 63: "Phones "
+ RenderBR {BR} at (130,15) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,228) size 769x1
+ RenderBlock (anonymous) at (0,236) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,235) size 769x3
+ RenderBlock (anonymous) at (0,243) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,244) size 769x19
- RenderInline {SPAN} at (0,0) size 128x15
- RenderInline {SPAN} at (0,0) size 128x15
+ RenderBlock (anonymous) at (0,252) size 769x22
+ RenderInline {SPAN} at (0,0) size 132x15
+ RenderInline {SPAN} at (0,0) size 132x15
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 128x17
+ RenderInline {SPAN} at (0,0) size 132x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 62x17
- RenderText {#text} at (62,0) size 66x17
- text run at (62,0) width 4: " "
- text run at (66,0) width 62: "Itinerary"
+ RenderImage {IMG} at (0,0) size 66x21
+ RenderText {#text} at (66,1) size 66x17
+ text run at (66,1) width 4: " "
+ text run at (70,1) width 62: "Itinerary"
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,262) size 769x61
- RenderTable {TABLE} at (0,0) size 581x60
- RenderTableSection {TBODY} at (0,0) size 581x60
- RenderTableRow {TR} at (0,2) size 581x56
+ RenderBlock (anonymous) at (0,273) size 769x61
+ RenderTable {TABLE} at (0,0) size 585x60
+ RenderTableSection {TBODY} at (0,0) size 585x60
+ RenderTableRow {TR} at (0,2) size 585x56
RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,20) size 149x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 147x17
+ RenderTableCell {TD} at (10,18) size 153x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 151x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (165,2) size 418x56 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 147x17
text run at (1,1) width 147: "TUR - Tour Package"
RenderBR {BR} at (148,15) size 0x0
@@ -110,30 +110,30 @@
RenderBR {BR} at (229,33) size 0x0
RenderText {#text} at (1,37) size 416x17
text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
- RenderBlock (anonymous) at (0,322) size 769x1
+ RenderBlock (anonymous) at (0,333) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,328) size 769x3
+ RenderBlock (anonymous) at (0,339) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,337) size 769x1
+ RenderBlock (anonymous) at (0,348) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,337) size 769x197
- RenderTable {TABLE} at (0,0) size 710x196
- RenderTableSection {TBODY} at (0,0) size 710x196
- RenderTableRow {TR} at (0,2) size 710x192
+ RenderBlock (anonymous) at (0,348) size 769x197
+ RenderTable {TABLE} at (0,0) size 714x196
+ RenderTableSection {TBODY} at (0,0) size 714x196
+ RenderTableRow {TR} at (0,2) size 714x192
RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 606x192 [r=0 c=3 rs=1 cs=1]
RenderBlock (anonymous) at (1,1) size 604x126
RenderText {#text} at (0,0) size 24x17
text run at (0,0) width 24: "Air "
@@ -206,30 +206,30 @@
RenderInline {SPACE} at (0,0) size 0x17
RenderInline {SPACE} at (0,0) size 0x17
RenderBR {BR} at (0,0) size 0x17
- RenderBlock (anonymous) at (0,533) size 769x1
+ RenderBlock (anonymous) at (0,544) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,540) size 769x3
+ RenderBlock (anonymous) at (0,551) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,548) size 769x1
+ RenderBlock (anonymous) at (0,559) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,548) size 769x197
- RenderTable {TABLE} at (0,0) size 599x196
- RenderTableSection {TBODY} at (0,0) size 599x196
- RenderTableRow {TR} at (0,2) size 599x192
+ RenderBlock (anonymous) at (0,559) size 769x197
+ RenderTable {TABLE} at (0,0) size 603x196
+ RenderTableSection {TBODY} at (0,0) size 603x196
+ RenderTableRow {TR} at (0,2) size 603x192
RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 495x192 [r=0 c=3 rs=1 cs=1]
RenderBlock (anonymous) at (1,1) size 493x126
RenderText {#text} at (0,0) size 24x17
text run at (0,0) width 24: "Air "
@@ -302,30 +302,30 @@
RenderInline {SPACE} at (0,0) size 0x17
RenderInline {SPACE} at (0,0) size 0x17
RenderBR {BR} at (0,0) size 0x17
- RenderBlock (anonymous) at (0,744) size 769x1
+ RenderBlock (anonymous) at (0,755) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,751) size 769x3
+ RenderBlock (anonymous) at (0,762) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,760) size 769x1
+ RenderBlock (anonymous) at (0,771) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,760) size 769x115
- RenderTable {TABLE} at (0,0) size 614x114
- RenderTableSection {TBODY} at (0,0) size 614x114
- RenderTableRow {TR} at (0,2) size 614x110
+ RenderBlock (anonymous) at (0,771) size 769x115
+ RenderTable {TABLE} at (0,0) size 618x114
+ RenderTableSection {TBODY} at (0,0) size 618x114
+ RenderTableRow {TR} at (0,2) size 618x110
RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,47) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,45) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 510x110 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 24x17
text run at (1,1) width 24: "Air "
RenderBR {BR} at (0,0) size 0x0
@@ -355,15 +355,15 @@
RenderText {#text} at (241,91) size 4x17
text run at (241,91) width 4: " "
RenderBR {BR} at (245,105) size 0x0
- RenderBlock (anonymous) at (0,874) size 769x1
+ RenderBlock (anonymous) at (0,885) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,880) size 769x3
+ RenderBlock (anonymous) at (0,891) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,889) size 769x49
+ RenderBlock (anonymous) at (0,900) size 769x49
RenderInline {SPAN} at (0,0) size 196x46
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -384,28 +384,28 @@
text run at (126,33) width 70: "8103220490"
RenderBR {BR} at (196,45) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,944) size 769x3
+ RenderBlock (anonymous) at (0,955) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,952) size 769x19
- RenderInline {SPAN} at (0,0) size 182x15
- RenderInline {SPAN} at (0,0) size 182x17
+ RenderBlock (anonymous) at (0,963) size 769x22
+ RenderInline {SPAN} at (0,0) size 186x15
+ RenderInline {SPAN} at (0,0) size 186x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 62x17
- RenderText {#text} at (62,0) size 4x17
- text run at (62,0) width 4: " "
+ RenderImage {IMG} at (0,0) size 66x21
+ RenderText {#text} at (66,1) size 4x17
+ text run at (66,1) width 4: " "
RenderInline {B} at (0,0) size 112x17
- RenderText {#text} at (66,0) size 112x17
- text run at (66,0) width 112: "Web Bookings"
- RenderText {#text} at (178,0) size 4x17
- text run at (178,0) width 4: " "
+ RenderText {#text} at (70,1) size 112x17
+ text run at (70,1) width 112: "Web Bookings"
+ RenderText {#text} at (182,1) size 4x17
+ text run at (182,1) width 4: " "
RenderInline {SPAN} at (0,0) size 0x17
- RenderBR {BR} at (182,14) size 0x0
+ RenderBR {BR} at (186,15) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,977) size 769x3
+ RenderBlock (anonymous) at (0,991) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,986) size 769x19
+ RenderBlock (anonymous) at (0,1000) size 769x19
RenderInline {SPAN} at (0,0) size 261x15
RenderInline {SPAN} at (0,0) size 261x15
RenderText {#text} at (0,0) size 0x0
@@ -418,7 +418,7 @@
RenderBR {BR} at (261,14) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,1010) size 769x32
+ RenderBlock (anonymous) at (0,1024) size 769x32
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,15) size 769x16
RenderText {#text} at (0,0) size 204x15
@@ -427,7 +427,7 @@
RenderText {#text} at (204,0) size 163x15
text run at (204,0) width 163: "Click here for latest updates"
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,1054) size 769x1
+ RenderBlock (anonymous) at (0,1068) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
@@ -436,40 +436,40 @@
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 88x15
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,26) size 4x4
- RenderText {#text} at (4,18) size 4x15
- text run at (4,18) width 4: " "
+ RenderImage {IMG} at (0,29) size 4x4
+ RenderText {#text} at (4,21) size 4x15
+ text run at (4,21) width 4: " "
RenderInline {SPAN} at (0,0) size 80x15
- RenderText {#text} at (8,18) size 80x15
- text run at (8,18) width 80: "HAO, SCOTT"
- RenderBR {BR} at (88,30) size 0x0
+ RenderText {#text} at (8,21) size 80x15
+ text run at (8,21) width 80: "HAO, SCOTT"
+ RenderBR {BR} at (88,33) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (23,92) size 576x30
+layer at (23,95) size 576x30
RenderInline (relative positioned) {SPAN} at (0,0) size 576x30
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,26) size 4x4
- RenderText {#text} at (4,18) size 572x15
- text run at (4,18) width 4: " "
- text run at (8,18) width 56: "Address: "
- text run at (64,18) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
- RenderBR {BR} at (576,30) size 0x0
- RenderImage {IMG} at (0,41) size 4x4
- RenderText {#text} at (4,33) size 409x15
- text run at (4,33) width 4: " "
- text run at (8,33) width 48: "Deliver: "
- text run at (56,33) width 104: "DEBI STANGEL, "
- text run at (160,33) width 117: "119 GLEN COURT, "
- text run at (277,33) width 136: "DANVILLE CA Z/94526"
-layer at (23,155) size 4x15
+ RenderImage {IMG} at (0,28) size 4x4
+ RenderText {#text} at (4,20) size 572x15
+ text run at (4,20) width 4: " "
+ text run at (8,20) width 56: "Address: "
+ text run at (64,20) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
+ RenderBR {BR} at (576,32) size 0x0
+ RenderImage {IMG} at (0,43) size 4x4
+ RenderText {#text} at (4,35) size 409x15
+ text run at (4,35) width 4: " "
+ text run at (8,35) width 48: "Deliver: "
+ text run at (56,35) width 104: "DEBI STANGEL, "
+ text run at (160,35) width 117: "119 GLEN COURT, "
+ text run at (277,35) width 136: "DANVILLE CA Z/94526"
+layer at (23,160) size 4x15
RenderInline (relative positioned) {SPAN} at (0,0) size 4x15
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,18) size 4x4
+ RenderImage {IMG} at (0,21) size 4x4
RenderText {#text} at (0,0) size 0x0
-layer at (23,177) size 769x60
- RenderBlock (anonymous) at (0,168) size 769x61
-layer at (43,162) size 529x60
+layer at (23,185) size 769x60
+ RenderBlock (anonymous) at (0,176) size 769x61
+layer at (43,170) size 529x60
RenderTable {TABLE} at (0,0) size 529x60 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 527x58
RenderTableRow {TR} at (0,2) size 527x22 [bgcolor=#E0E0E0]
diff --git a/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.png b/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.png
index 028ddfa..ee05823 100644
--- a/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.png
+++ b/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.txt b/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.txt
index c375f9b..7587b34 100644
--- a/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.txt
+++ b/LayoutTests/platform/efl/fast/encoding/utf-16-little-endian-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 792x1062
+layer at (0,0) size 792x1076
RenderView at (0,0) size 785x585
-layer at (0,0) size 785x1062
- RenderBlock {HTML} at (0,0) size 785x1063
- RenderBody {BODY} at (8,8) size 769x1042 [bgcolor=#EEEEEE]
+layer at (0,0) size 785x1076
+ RenderBlock {HTML} at (0,0) size 785x1077
+ RenderBody {BODY} at (8,8) size 769x1056 [bgcolor=#EEEEEE]
RenderBlock (anonymous) at (0,0) size 769x20
RenderInline {SPAN} at (0,0) size 191x15
RenderText {#text} at (0,0) size 0x0
@@ -23,85 +23,85 @@
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,26) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,35) size 769x34
- RenderInline {SPAN} at (0,0) size 110x31
- RenderInline {SPAN} at (0,0) size 110x31
+ RenderBlock (anonymous) at (0,35) size 769x37
+ RenderInline {SPAN} at (0,0) size 114x33
+ RenderInline {SPAN} at (0,0) size 114x33
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 110x17
+ RenderInline {SPAN} at (0,0) size 114x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 53x17
- RenderText {#text} at (53,0) size 57x17
- text run at (53,0) width 4: " "
- text run at (57,0) width 53: "Names"
- RenderBR {BR} at (110,14) size 0x0
+ RenderImage {IMG} at (0,0) size 57x21
+ RenderText {#text} at (57,1) size 57x17
+ text run at (57,1) width 4: " "
+ text run at (61,1) width 53: "Names"
+ RenderBR {BR} at (114,15) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 88x15
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,74) size 769x3
+ RenderBlock (anonymous) at (0,77) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,83) size 769x49
- RenderInline {SPAN} at (0,0) size 576x46
- RenderInline {SPAN} at (0,0) size 576x46
+ RenderBlock (anonymous) at (0,86) size 769x51
+ RenderInline {SPAN} at (0,0) size 576x48
+ RenderInline {SPAN} at (0,0) size 576x48
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,3) size 62x15
- RenderText {#text} at (62,2) size 4x15
- text run at (62,2) width 4: " "
+ RenderImage {IMG} at (0,1) size 66x19
+ RenderText {#text} at (66,2) size 4x15
+ text run at (66,2) width 4: " "
RenderInline {SPAN} at (0,0) size 83x17
- RenderText {#text} at (66,0) size 83x17
- text run at (66,0) width 83: "Addresses"
- RenderBR {BR} at (149,14) size 0x0
+ RenderText {#text} at (70,0) size 83x17
+ text run at (70,0) width 83: "Addresses"
+ RenderBR {BR} at (153,14) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,138) size 769x3
+ RenderBlock (anonymous) at (0,143) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,146) size 769x23
- RenderInline {SPAN} at (0,0) size 126x23
- RenderInline {SPAN} at (0,0) size 126x23
+ RenderBlock (anonymous) at (0,151) size 769x26
+ RenderInline {SPAN} at (0,0) size 130x25
+ RenderInline {SPAN} at (0,0) size 130x25
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 126x17
+ RenderInline {SPAN} at (0,0) size 130x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 59x17
- RenderText {#text} at (59,0) size 67x17
- text run at (59,0) width 4: " "
- text run at (63,0) width 63: "Phones "
- RenderBR {BR} at (126,14) size 0x0
+ RenderImage {IMG} at (0,0) size 63x21
+ RenderText {#text} at (63,1) size 67x17
+ text run at (63,1) width 4: " "
+ text run at (67,1) width 63: "Phones "
+ RenderBR {BR} at (130,15) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,228) size 769x1
+ RenderBlock (anonymous) at (0,236) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,235) size 769x3
+ RenderBlock (anonymous) at (0,243) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,244) size 769x19
- RenderInline {SPAN} at (0,0) size 128x15
- RenderInline {SPAN} at (0,0) size 128x15
+ RenderBlock (anonymous) at (0,252) size 769x22
+ RenderInline {SPAN} at (0,0) size 132x15
+ RenderInline {SPAN} at (0,0) size 132x15
RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 128x17
+ RenderInline {SPAN} at (0,0) size 132x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 62x17
- RenderText {#text} at (62,0) size 66x17
- text run at (62,0) width 4: " "
- text run at (66,0) width 62: "Itinerary"
+ RenderImage {IMG} at (0,0) size 66x21
+ RenderText {#text} at (66,1) size 66x17
+ text run at (66,1) width 4: " "
+ text run at (70,1) width 62: "Itinerary"
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,262) size 769x61
- RenderTable {TABLE} at (0,0) size 581x60
- RenderTableSection {TBODY} at (0,0) size 581x60
- RenderTableRow {TR} at (0,2) size 581x56
+ RenderBlock (anonymous) at (0,273) size 769x61
+ RenderTable {TABLE} at (0,0) size 585x60
+ RenderTableSection {TBODY} at (0,0) size 585x60
+ RenderTableRow {TR} at (0,2) size 585x56
RenderTableCell {TD} at (2,29) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,20) size 149x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 147x17
+ RenderTableCell {TD} at (10,18) size 153x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 151x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (161,2) size 418x56 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (165,2) size 418x56 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 147x17
text run at (1,1) width 147: "TUR - Tour Package"
RenderBR {BR} at (148,15) size 0x0
@@ -110,30 +110,30 @@
RenderBR {BR} at (229,33) size 0x0
RenderText {#text} at (1,37) size 416x17
text run at (1,37) width 416: "Comments: -** TICKETLESS CONF CODE IS WHGNSO**"
- RenderBlock (anonymous) at (0,322) size 769x1
+ RenderBlock (anonymous) at (0,333) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,328) size 769x3
+ RenderBlock (anonymous) at (0,339) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,337) size 769x1
+ RenderBlock (anonymous) at (0,348) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,337) size 769x197
- RenderTable {TABLE} at (0,0) size 710x196
- RenderTableSection {TBODY} at (0,0) size 710x196
- RenderTableRow {TR} at (0,2) size 710x192
+ RenderBlock (anonymous) at (0,348) size 769x197
+ RenderTable {TABLE} at (0,0) size 714x196
+ RenderTableSection {TBODY} at (0,0) size 714x196
+ RenderTableRow {TR} at (0,2) size 714x192
RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 606x192 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 606x192 [r=0 c=3 rs=1 cs=1]
RenderBlock (anonymous) at (1,1) size 604x126
RenderText {#text} at (0,0) size 24x17
text run at (0,0) width 24: "Air "
@@ -206,30 +206,30 @@
RenderInline {SPACE} at (0,0) size 0x17
RenderInline {SPACE} at (0,0) size 0x17
RenderBR {BR} at (0,0) size 0x17
- RenderBlock (anonymous) at (0,533) size 769x1
+ RenderBlock (anonymous) at (0,544) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,540) size 769x3
+ RenderBlock (anonymous) at (0,551) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,548) size 769x1
+ RenderBlock (anonymous) at (0,559) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,548) size 769x197
- RenderTable {TABLE} at (0,0) size 599x196
- RenderTableSection {TBODY} at (0,0) size 599x196
- RenderTableRow {TR} at (0,2) size 599x192
+ RenderBlock (anonymous) at (0,559) size 769x197
+ RenderTable {TABLE} at (0,0) size 603x196
+ RenderTableSection {TBODY} at (0,0) size 603x196
+ RenderTableRow {TR} at (0,2) size 603x192
RenderTableCell {TD} at (2,97) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,88) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,86) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 495x192 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 495x192 [r=0 c=3 rs=1 cs=1]
RenderBlock (anonymous) at (1,1) size 493x126
RenderText {#text} at (0,0) size 24x17
text run at (0,0) width 24: "Air "
@@ -302,30 +302,30 @@
RenderInline {SPACE} at (0,0) size 0x17
RenderInline {SPACE} at (0,0) size 0x17
RenderBR {BR} at (0,0) size 0x17
- RenderBlock (anonymous) at (0,744) size 769x1
+ RenderBlock (anonymous) at (0,755) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,751) size 769x3
+ RenderBlock (anonymous) at (0,762) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,760) size 769x1
+ RenderBlock (anonymous) at (0,771) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,760) size 769x115
- RenderTable {TABLE} at (0,0) size 614x114
- RenderTableSection {TBODY} at (0,0) size 614x114
- RenderTableRow {TR} at (0,2) size 614x110
+ RenderBlock (anonymous) at (0,771) size 769x115
+ RenderTable {TABLE} at (0,0) size 618x114
+ RenderTableSection {TBODY} at (0,0) size 618x114
+ RenderTableRow {TR} at (0,2) size 618x110
RenderTableCell {TD} at (2,56) size 2x2 [r=0 c=0 rs=1 cs=1]
RenderTableCell {TD} at (6,2) size 2x2 [r=0 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (10,47) size 90x19 [r=0 c=2 rs=1 cs=1]
- RenderImage {IMG} at (1,1) size 88x17
+ RenderTableCell {TD} at (10,45) size 94x23 [r=0 c=2 rs=1 cs=1]
+ RenderImage {IMG} at (1,1) size 92x21
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (102,2) size 510x110 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (106,2) size 510x110 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 24x17
text run at (1,1) width 24: "Air "
RenderBR {BR} at (0,0) size 0x0
@@ -355,15 +355,15 @@
RenderText {#text} at (241,91) size 4x17
text run at (241,91) width 4: " "
RenderBR {BR} at (245,105) size 0x0
- RenderBlock (anonymous) at (0,874) size 769x1
+ RenderBlock (anonymous) at (0,885) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,880) size 769x3
+ RenderBlock (anonymous) at (0,891) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,889) size 769x49
+ RenderBlock (anonymous) at (0,900) size 769x49
RenderInline {SPAN} at (0,0) size 196x46
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
@@ -384,28 +384,28 @@
text run at (126,33) width 70: "8103220490"
RenderBR {BR} at (196,45) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,944) size 769x3
+ RenderBlock (anonymous) at (0,955) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,952) size 769x19
- RenderInline {SPAN} at (0,0) size 182x15
- RenderInline {SPAN} at (0,0) size 182x17
+ RenderBlock (anonymous) at (0,963) size 769x22
+ RenderInline {SPAN} at (0,0) size 186x15
+ RenderInline {SPAN} at (0,0) size 186x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,1) size 62x17
- RenderText {#text} at (62,0) size 4x17
- text run at (62,0) width 4: " "
+ RenderImage {IMG} at (0,0) size 66x21
+ RenderText {#text} at (66,1) size 4x17
+ text run at (66,1) width 4: " "
RenderInline {B} at (0,0) size 112x17
- RenderText {#text} at (66,0) size 112x17
- text run at (66,0) width 112: "Web Bookings"
- RenderText {#text} at (178,0) size 4x17
- text run at (178,0) width 4: " "
+ RenderText {#text} at (70,1) size 112x17
+ text run at (70,1) width 112: "Web Bookings"
+ RenderText {#text} at (182,1) size 4x17
+ text run at (182,1) width 4: " "
RenderInline {SPAN} at (0,0) size 0x17
- RenderBR {BR} at (182,14) size 0x0
+ RenderBR {BR} at (186,15) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,977) size 769x3
+ RenderBlock (anonymous) at (0,991) size 769x3
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
- RenderBlock (anonymous) at (0,986) size 769x19
+ RenderBlock (anonymous) at (0,1000) size 769x19
RenderInline {SPAN} at (0,0) size 261x15
RenderInline {SPAN} at (0,0) size 261x15
RenderText {#text} at (0,0) size 0x0
@@ -418,7 +418,7 @@
RenderBR {BR} at (261,14) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,1010) size 769x32
+ RenderBlock (anonymous) at (0,1024) size 769x32
RenderBlock {HR} at (0,0) size 769x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,15) size 769x16
RenderText {#text} at (0,0) size 204x15
@@ -427,7 +427,7 @@
RenderText {#text} at (204,0) size 163x15
text run at (204,0) width 163: "Click here for latest updates"
RenderText {#text} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,1054) size 769x1
+ RenderBlock (anonymous) at (0,1068) size 769x1
RenderInline {SPAN} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
@@ -436,40 +436,40 @@
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 88x15
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,26) size 4x4
- RenderText {#text} at (4,18) size 4x15
- text run at (4,18) width 4: " "
+ RenderImage {IMG} at (0,29) size 4x4
+ RenderText {#text} at (4,21) size 4x15
+ text run at (4,21) width 4: " "
RenderInline {SPAN} at (0,0) size 80x15
- RenderText {#text} at (8,18) size 80x15
- text run at (8,18) width 80: "HAO, SCOTT"
- RenderBR {BR} at (88,30) size 0x0
+ RenderText {#text} at (8,21) size 80x15
+ text run at (8,21) width 80: "HAO, SCOTT"
+ RenderBR {BR} at (88,33) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (23,92) size 576x30
+layer at (23,95) size 576x30
RenderInline (relative positioned) {SPAN} at (0,0) size 576x30
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,26) size 4x4
- RenderText {#text} at (4,18) size 572x15
- text run at (4,18) width 4: " "
- text run at (8,18) width 56: "Address: "
- text run at (64,18) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
- RenderBR {BR} at (576,30) size 0x0
- RenderImage {IMG} at (0,41) size 4x4
- RenderText {#text} at (4,33) size 409x15
- text run at (4,33) width 4: " "
- text run at (8,33) width 48: "Deliver: "
- text run at (56,33) width 104: "DEBI STANGEL, "
- text run at (160,33) width 117: "119 GLEN COURT, "
- text run at (277,33) width 136: "DANVILLE CA Z/94526"
-layer at (23,155) size 4x15
+ RenderImage {IMG} at (0,28) size 4x4
+ RenderText {#text} at (4,20) size 572x15
+ text run at (4,20) width 4: " "
+ text run at (8,20) width 56: "Address: "
+ text run at (64,20) width 512: "ST. JUDE MEDICAL, 21700 OXNARD ST SUITE 800, WOODLAND HILLS CA Z/91367 "
+ RenderBR {BR} at (576,32) size 0x0
+ RenderImage {IMG} at (0,43) size 4x4
+ RenderText {#text} at (4,35) size 409x15
+ text run at (4,35) width 4: " "
+ text run at (8,35) width 48: "Deliver: "
+ text run at (56,35) width 104: "DEBI STANGEL, "
+ text run at (160,35) width 117: "119 GLEN COURT, "
+ text run at (277,35) width 136: "DANVILLE CA Z/94526"
+layer at (23,160) size 4x15
RenderInline (relative positioned) {SPAN} at (0,0) size 4x15
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,18) size 4x4
+ RenderImage {IMG} at (0,21) size 4x4
RenderText {#text} at (0,0) size 0x0
-layer at (23,177) size 769x60
- RenderBlock (anonymous) at (0,168) size 769x61
-layer at (43,162) size 529x60
+layer at (23,185) size 769x60
+ RenderBlock (anonymous) at (0,176) size 769x61
+layer at (43,170) size 529x60
RenderTable {TABLE} at (0,0) size 529x60 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 527x58
RenderTableRow {TR} at (0,2) size 527x22 [bgcolor=#E0E0E0]
diff --git a/LayoutTests/platform/efl/fast/flexbox/023-expected.png b/LayoutTests/platform/efl/fast/flexbox/023-expected.png
index f3d030a..e6091c5 100644
--- a/LayoutTests/platform/efl/fast/flexbox/023-expected.png
+++ b/LayoutTests/platform/efl/fast/flexbox/023-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/flexbox/024-expected.png b/LayoutTests/platform/efl/fast/flexbox/024-expected.png
index f3d030a..e6091c5 100644
--- a/LayoutTests/platform/efl/fast/flexbox/024-expected.png
+++ b/LayoutTests/platform/efl/fast/flexbox/024-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/forms/input-value-expected.png b/LayoutTests/platform/efl/fast/forms/input-value-expected.png
index e16d7f3..5cd0f28 100644
--- a/LayoutTests/platform/efl/fast/forms/input-value-expected.png
+++ b/LayoutTests/platform/efl/fast/forms/input-value-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/forms/input-value-expected.txt b/LayoutTests/platform/efl/fast/forms/input-value-expected.txt
index 0b4e6c5..8e0b215 100644
--- a/LayoutTests/platform/efl/fast/forms/input-value-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/input-value-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x620
+layer at (0,0) size 785x623
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x620
- RenderBlock {HTML} at (0,0) size 785x620
- RenderBody {BODY} at (8,8) size 769x596
+layer at (0,0) size 785x623
+ RenderBlock {HTML} at (0,0) size 785x623
+ RenderBody {BODY} at (8,8) size 769x599
RenderBlock {P} at (0,0) size 769x36
RenderText {#text} at (0,0) size 750x35
text run at (0,0) width 750: "Results that match WinIE are two columns on the right that say \"after\" every time, except for the last row which should"
@@ -11,8 +11,8 @@
RenderText {#text} at (0,0) size 713x17
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."
RenderBlock {HR} at (0,86) size 769x2 [border: (1px inset #000000)]
- RenderBlock {FORM} at (0,96) size 769x500
- RenderTable {TABLE} at (0,0) size 769x500
+ RenderBlock {FORM} at (0,96) size 769x503
+ RenderTable {TABLE} at (0,0) size 769x503
RenderTableSection {THEAD} at (0,0) size 769x24
RenderTableRow {TR} at (0,2) size 769x20
RenderTableCell {TH} at (2,2) size 324x20 [r=0 c=0 rs=1 cs=1]
@@ -27,7 +27,7 @@
RenderTableCell {TH} at (706,2) size 61x20 [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 59x17
text run at (1,1) width 59: "attribute"
- RenderTableSection {TBODY} at (0,24) size 769x476
+ RenderTableSection {TBODY} at (0,24) size 769x479
RenderTableRow {TR} at (0,2) size 769x34
RenderTableCell {TD} at (2,9) size 324x20 [r=0 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 207x17
@@ -90,118 +90,118 @@
RenderTableCell {TD} at (706,131) size 61x20 [r=4 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,166) size 769x20
- RenderTableCell {TD} at (2,166) size 324x20 [r=5 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,166) size 769x23
+ RenderTableCell {TD} at (2,167) size 324x20 [r=5 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 222x17
text run at (1,1) width 222: "image with value property changed"
- RenderTableCell {TD} at (328,166) size 312x19 [r=5 c=1 rs=1 cs=1]
- RenderImage {INPUT} at (1,1) size 45x17
- RenderTableCell {TD} at (642,166) size 62x20 [r=5 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (328,166) size 312x23 [r=5 c=1 rs=1 cs=1]
+ RenderImage {INPUT} at (1,1) size 49x21
+ RenderTableCell {TD} at (642,167) size 62x20 [r=5 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,166) size 61x20 [r=5 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,167) size 61x20 [r=5 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,188) size 769x20
- RenderTableCell {TD} at (2,188) size 324x20 [r=6 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,191) size 769x20
+ RenderTableCell {TD} at (2,191) size 324x20 [r=6 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 216x17
text run at (1,1) width 216: "radio with value property changed"
- RenderTableCell {TD} at (328,188) size 312x20 [r=6 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,191) size 312x20 [r=6 c=1 rs=1 cs=1]
RenderBlock {INPUT} at (5,4) size 13x12
- RenderTableCell {TD} at (642,188) size 62x20 [r=6 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,191) size 62x20 [r=6 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,188) size 61x20 [r=6 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,191) size 61x20 [r=6 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,210) size 769x34
- RenderTableCell {TD} at (2,217) size 324x20 [r=7 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,213) size 769x34
+ RenderTableCell {TD} at (2,220) size 324x20 [r=7 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 205x17
text run at (1,1) width 205: "text with value attribute changed"
- RenderTableCell {TD} at (328,210) size 312x34 [r=7 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,213) size 312x34 [r=7 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
- RenderTableCell {TD} at (642,217) size 62x20 [r=7 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,220) size 62x20 [r=7 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,217) size 61x20 [r=7 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,220) size 61x20 [r=7 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,246) size 769x20
- RenderTableCell {TD} at (2,246) size 324x20 [r=8 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,249) size 769x20
+ RenderTableCell {TD} at (2,249) size 324x20 [r=8 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 247x17
text run at (1,1) width 247: "check box with value attribute changed"
- RenderTableCell {TD} at (328,246) size 312x20 [r=8 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,249) size 312x20 [r=8 c=1 rs=1 cs=1]
RenderBlock {INPUT} at (5,4) size 13x12
- RenderTableCell {TD} at (642,246) size 62x20 [r=8 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,249) size 62x20 [r=8 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,246) size 61x20 [r=8 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,249) size 61x20 [r=8 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,268) size 769x38
- RenderTableCell {TD} at (2,268) size 324x38 [r=9 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,271) size 769x38
+ RenderTableCell {TD} at (2,271) size 324x38 [r=9 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 314x35
text run at (1,1) width 314: "text with value property changed, then turned into"
text run at (1,19) width 65: "check box"
- RenderTableCell {TD} at (328,277) size 312x20 [r=9 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,280) size 312x20 [r=9 c=1 rs=1 cs=1]
RenderBlock {INPUT} at (5,4) size 13x12
- RenderTableCell {TD} at (642,277) size 62x20 [r=9 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,280) size 62x20 [r=9 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,277) size 61x20 [r=9 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,280) size 61x20 [r=9 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,308) size 769x38
- RenderTableCell {TD} at (2,308) size 324x38 [r=10 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,311) size 769x38
+ RenderTableCell {TD} at (2,311) size 324x38 [r=10 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 284x35
text run at (1,1) width 284: "check box with value property changed, then"
text run at (1,19) width 95: "turned into text"
- RenderTableCell {TD} at (328,310) size 312x34 [r=10 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,313) size 312x34 [r=10 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
- RenderTableCell {TD} at (642,317) size 62x20 [r=10 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,320) size 62x20 [r=10 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,317) size 61x20 [r=10 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,320) size 61x20 [r=10 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,348) size 769x38
- RenderTableCell {TD} at (2,348) size 324x38 [r=11 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,351) size 769x38
+ RenderTableCell {TD} at (2,351) size 324x38 [r=11 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 312x35
text run at (1,1) width 312: "text with value attribute changed, then turned into"
text run at (1,19) width 65: "check box"
- RenderTableCell {TD} at (328,357) size 312x20 [r=11 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,360) size 312x20 [r=11 c=1 rs=1 cs=1]
RenderBlock {INPUT} at (5,4) size 13x12
- RenderTableCell {TD} at (642,357) size 62x20 [r=11 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,360) size 62x20 [r=11 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,357) size 61x20 [r=11 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,360) size 61x20 [r=11 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,388) size 769x38
- RenderTableCell {TD} at (2,388) size 324x38 [r=12 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,391) size 769x38
+ RenderTableCell {TD} at (2,391) size 324x38 [r=12 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 282x35
text run at (1,1) width 282: "check box with value attribute changed, then"
text run at (1,19) width 95: "turned into text"
- RenderTableCell {TD} at (328,390) size 312x34 [r=12 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,393) size 312x34 [r=12 c=1 rs=1 cs=1]
RenderTextControl {INPUT} at (3,3) size 192x28 [bgcolor=#FFFFFF]
- RenderTableCell {TD} at (642,397) size 62x20 [r=12 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (642,400) size 62x20 [r=12 c=2 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableCell {TD} at (706,397) size 61x20 [r=12 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (706,400) size 61x20 [r=12 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 28x17
text run at (1,1) width 28: "after"
- RenderTableRow {TR} at (0,428) size 769x46
- RenderTableCell {TD} at (2,441) size 324x20 [r=13 c=0 rs=1 cs=1]
+ RenderTableRow {TR} at (0,431) size 769x46
+ RenderTableCell {TD} at (2,444) size 324x20 [r=13 c=0 rs=1 cs=1]
RenderText {#text} at (1,1) size 204x17
text run at (1,1) width 204: "file with value property changed"
- RenderTableCell {TD} at (328,428) size 312x46 [r=13 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (328,431) size 312x46 [r=13 c=1 rs=1 cs=1]
RenderFileUploadControl {INPUT} at (3,3) size 306x40 "No file selected"
RenderButton {INPUT} at (0,0) size 121x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderBlock (anonymous) at (17,10) size 87x18
RenderText at (0,0) size 87x17
text run at (0,0) width 87: "Choose File"
- RenderTableCell {TD} at (642,450) size 62x2 [r=13 c=2 rs=1 cs=1]
- RenderTableCell {TD} at (706,441) size 61x20 [r=13 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (642,453) size 62x2 [r=13 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (706,444) size 61x20 [r=13 c=3 rs=1 cs=1]
RenderText {#text} at (1,1) size 40x17
text run at (1,1) width 40: "before"
layer at (343,139) size 185x18
@@ -212,15 +212,15 @@
RenderBlock {DIV} at (4,6) size 185x18
RenderText {#text} at (0,0) size 36x17
text run at (0,0) width 36: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
-layer at (343,347) size 185x18
+layer at (343,350) size 185x18
RenderBlock {DIV} at (4,6) size 185x18
RenderText {#text} at (0,0) size 31x17
text run at (0,0) width 31: "after"
-layer at (343,447) size 185x18
+layer at (343,450) size 185x18
RenderBlock {DIV} at (4,6) size 185x18
RenderText {#text} at (0,0) size 31x17
text run at (0,0) width 31: "after"
-layer at (343,527) size 185x18
+layer at (343,530) size 185x18
RenderBlock {DIV} at (4,6) size 185x18
RenderText {#text} at (0,0) size 31x17
text run at (0,0) width 31: "after"
diff --git a/LayoutTests/platform/efl/fast/invalid/012-expected.png b/LayoutTests/platform/efl/fast/invalid/012-expected.png
index 3c31f3f..9508204 100644
--- a/LayoutTests/platform/efl/fast/invalid/012-expected.png
+++ b/LayoutTests/platform/efl/fast/invalid/012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png b/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png
index 23097f8..3972000 100644
--- a/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png
+++ b/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt b/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt
index 5f2ec48..e81e948 100644
--- a/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt
+++ b/LayoutTests/platform/efl/fast/lists/inlineBoxWrapperNullCheck-expected.txt
@@ -3,11 +3,11 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {DIV} at (0,0) size 190x21
- RenderBlock {UL} at (0,0) size 190x21
- RenderListItem {LI} at (40,0) size 150x21
+ RenderBlock {DIV} at (0,0) size 190x25
+ RenderBlock {UL} at (0,0) size 190x25
+ RenderListItem {LI} at (40,0) size 150x25
RenderListMarker at (0,0) size 7x17: bullet
- RenderInline {A} at (0,0) size 197x17
+ RenderInline {A} at (0,0) size 201x17
RenderText {#text} at (0,0) size 0x0
- RenderImage {IMG} at (0,0) size 197x17
+ RenderImage {IMG} at (0,0) size 201x21
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/fast/parser/comment-in-script-expected.png b/LayoutTests/platform/efl/fast/parser/comment-in-script-expected.png
index edec38f..20821ab 100644
--- a/LayoutTests/platform/efl/fast/parser/comment-in-script-expected.png
+++ b/LayoutTests/platform/efl/fast/parser/comment-in-script-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png b/LayoutTests/platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
index 89ca33c..77e03b1 100644
--- a/LayoutTests/platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
+++ b/LayoutTests/platform/efl/fast/text/whitespace/normal-after-nowrap-breaking-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2997-expected.png b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2997-expected.png
index 7c3b0a0..425560a 100644
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2997-expected.png
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2997-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png b/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png
index 1f07489..67d6810 100644
--- a/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png
+++ b/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt b/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt
index c9083b8..4e3bbb3 100644
--- a/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/collapsing_borders/bug41262-3-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x659
+layer at (0,0) size 785x663
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x659
- RenderBlock {HTML} at (0,0) size 785x659
- RenderBody {BODY} at (8,16) size 769x627
+layer at (0,0) size 785x663
+ RenderBlock {HTML} at (0,0) size 785x663
+ RenderBody {BODY} at (8,16) size 769x631
RenderBlock {P} at (0,0) size 769x54
RenderText {#text} at (0,0) size 752x53
text run at (0,0) width 463: "Following table should have 6px solid blue border around cell 3, red 5px "
@@ -89,7 +89,7 @@
RenderTableCell {TD} at (102,214) size 51x53 [border: (1px solid #FF0000)] [r=4 c=2 rs=1 cs=1]
RenderText {#text} at (17,17) size 16x17
text run at (17,17) width 16: "15"
- RenderBlock {P} at (0,440) size 769x53
+ RenderBlock {P} at (0,440) size 769x57
RenderText {#text} at (0,0) size 357x17
text run at (0,0) width 357: "This is an example rendering for the previous table from "
RenderInline {A} at (0,0) size 700x35 [color=#0000EE]
@@ -99,9 +99,9 @@
RenderText {#text} at (68,18) size 8x17
text run at (68,18) width 8: ": "
RenderBR {BR} at (0,0) size 0x0
- RenderImage {IMG} at (0,36) size 213x17
+ RenderImage {IMG} at (0,36) size 217x21
RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,509) size 769x36
+ RenderBlock {P} at (0,513) size 769x36
RenderText {#text} at (0,0) size 755x35
text run at (0,0) width 493: "Following table should have 2px solid black line between rows. There should "
text run at (493,0) width 262: "be a total of two lines. There will be three"
@@ -111,7 +111,7 @@
text run at (213,21) width 112: "tr:first-child"
RenderText {#text} at (325,18) size 4x17
text run at (325,18) width 4: "."
- RenderTable {TABLE} at (0,561) size 150x66 [border: (1px none #808080)]
+ RenderTable {TABLE} at (0,565) size 150x66 [border: (1px none #808080)]
RenderTableSection {TBODY} at (0,1) size 150x65
RenderTableRow {TR} at (0,0) size 150x22 [border: (2px solid #000000) none]
RenderTableCell {TD} at (0,0) size 50x22 [border: (1px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index 9b77c73..0c42a82 100644
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -1266,6 +1266,14 @@
# Enable when support drag-and-drop autoscrolling
webkit.org/b/39725 fast/events/drag-and-drop-autoscroll.html [ Skip ]
+# Needs rebaseline.
+webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
+webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
+
# Leaking state into the next test.
webkit.org/b/85522 http/tests/security/sandboxed-iframe-form-top.html [ Skip ]
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 2e36116..fc49d44 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1402,6 +1402,15 @@
webkit.org/b/106415 fast/workers/worker-document-leak.html [ Pass Failure ]
webkit.org/b/106415 fast/workers/worker-lifecycle.html [ Pass Failure ]
+# Needs rebaseline.
+webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
+webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
+webkit.org/b/94198 fast/lists/inlineBoxWrapperNullCheck.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
+
# Spellchecker behavior tests.
webkit.org/b/108370 editing/spelling/spelling-double-clicked-word.html [ Skip ]
webkit.org/b/108370 editing/spelling/spelling-double-clicked-word-with-underscores.html [ Skip ]
diff --git a/LayoutTests/platform/qt/TestExpectations b/LayoutTests/platform/qt/TestExpectations
index 74e03b6..2c2fce2 100644
--- a/LayoutTests/platform/qt/TestExpectations
+++ b/LayoutTests/platform/qt/TestExpectations
@@ -2558,6 +2558,14 @@
webkit.org/b/99306 animations/missing-values-last-keyframe.html [ ImageOnlyFailure ]
webkit.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.
+# Needs rebaseline.
+webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
+webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
+
# REGRESSION(r132143): It made fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html flakey
webkit.org/b/100117 fast/xmlhttprequest/xmlhttprequest-recursive-sync-event.html
webkit.org/b/100117 editing/style/iframe-onload-crash-mac.html
diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
index abc2dcf..188091d 100644
--- a/LayoutTests/platform/win/TestExpectations
+++ b/LayoutTests/platform/win/TestExpectations
@@ -2510,6 +2510,14 @@
fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html
fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html
+# Needs rebaseline.
+webkit.org/b/94198 fast/dom/HTMLImageElement/image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/dom/HTMLInputElement/input-image-alt-text.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-big-endian.html [ Failure ]
+webkit.org/b/94198 fast/encoding/utf-16-little-endian.html [ Failure ]
+webkit.org/b/94198 fast/forms/input-value.html [ Failure ]
+webkit.org/b/94198 tables/mozilla/collapsing_borders/bug41262-3.html [ Failure ]
+
# ACCELERATED_OVERFLOW_SCROLLING is disabled on Windows
compositing/overflow/scrolling-without-painting.html
compositing/overflow/updating-scrolling-content.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 220f86b..be348de 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2013-04-02 Christophe Dumez <ch.dumez@sisa.samsung.com>
+
+ 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.
+
+ 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):
+
2013-04-02 Raymond Toy <rtoy@google.com>
Add support for using ARM FFT in WebAudio
diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
index ced8a99..68630d1 100644
--- a/Source/WebCore/rendering/RenderImage.cpp
+++ b/Source/WebCore/rendering/RenderImage.cpp
@@ -127,8 +127,8 @@
FontCachePurgePreventer fontCachePurgePreventer;
const Font& font = style()->font();
- IntSize textSize(min(font.width(RenderBlock::constructTextRun(this, font, m_altText, style())), maxAltTextWidth), min(font.fontMetrics().height(), maxAltTextHeight));
- imageSize = imageSize.expandedTo(textSize);
+ IntSize paddedTextSize(paddingWidth + min(ceilf(font.width(RenderBlock::constructTextRun(this, font, m_altText, style()))), maxAltTextWidth), paddingHeight + min(font.fontMetrics().height(), maxAltTextHeight));
+ imageSize = imageSize.expandedTo(paddedTextSize);
}
if (imageSize == intrinsicSize())
@@ -321,6 +321,8 @@
page->addRelevantUnpaintedObject(this, visualOverflowRect());
if (cWidth > 2 && cHeight > 2) {
+ const int borderWidth = 1;
+
// Draw an outline rect where the image should be.
context->setStrokeStyle(SolidStroke);
context->setStrokeColor(Color::lightGray, style()->colorSpace());
@@ -331,8 +333,8 @@
LayoutSize imageOffset;
// When calculating the usable dimensions, exclude the pixels of
// the ouline rect so the error image/alt text doesn't draw on it.
- LayoutUnit usableWidth = cWidth - 2;
- LayoutUnit usableHeight = cHeight - 2;
+ LayoutUnit usableWidth = cWidth - 2 * borderWidth;
+ LayoutUnit usableHeight = cHeight - 2 * borderWidth;
RefPtr<Image> image = m_imageResource->image();
@@ -350,7 +352,7 @@
LayoutUnit centerY = (usableHeight - imageSize.height()) / 2;
if (centerY < 0)
centerY = 0;
- imageOffset = LayoutSize(leftBorder + leftPad + centerX + 1, topBorder + topPad + centerY + 1);
+ imageOffset = LayoutSize(leftBorder + leftPad + centerX + borderWidth, topBorder + topPad + centerY + borderWidth);
context->drawImage(image.get(), style()->colorSpace(), pixelSnappedIntRect(LayoutRect(paintOffset + imageOffset, imageSize)), CompositeSourceOver, shouldRespectImageOrientation());
errorPictureDrawn = true;
}
@@ -362,7 +364,7 @@
const FontMetrics& fontMetrics = font.fontMetrics();
LayoutUnit ascent = fontMetrics.ascent();
LayoutPoint altTextOffset = paintOffset;
- altTextOffset.move(leftBorder + leftPad, topBorder + topPad + ascent);
+ altTextOffset.move(leftBorder + leftPad + (paddingWidth / 2) - borderWidth, topBorder + topPad + ascent + (paddingHeight / 2) - borderWidth);
// Only draw the alt text if it'll fit within the content box,
// and only if it fits above the error image.
@@ -371,7 +373,7 @@
if (errorPictureDrawn) {
if (usableWidth >= textWidth && fontMetrics.height() <= imageOffset.height())
context->drawText(font, textRun, altTextOffset);
- } else if (usableWidth >= textWidth && cHeight >= fontMetrics.height())
+ } else if (usableWidth >= textWidth && usableHeight >= fontMetrics.height())
context->drawText(font, textRun, altTextOffset);
}
}
