Log Message
[EFL] Several fast/block test cases need rebaseline after r127163 https://bugs.webkit.org/show_bug.cgi?id=96237
Unreviewed EFL gardening. Rebaseline 4 fast/block test cases due to r127163. Patch by Christophe Dumez <[email protected]> on 2012-09-10 * platform/efl/TestExpectations: * platform/efl/fast/block/float/024-expected.png: * platform/efl/fast/block/float/024-expected.txt: * platform/efl/fast/block/margin-collapse/025-expected.txt: * platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt: * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.png: * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt:
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/platform/efl/TestExpectations
- trunk/LayoutTests/platform/efl/fast/block/float/024-expected.png
- trunk/LayoutTests/platform/efl/fast/block/float/024-expected.txt
- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/025-expected.txt
- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt
- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.png
- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (128024 => 128025)
--- trunk/LayoutTests/ChangeLog 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/ChangeLog 2012-09-10 07:56:43 UTC (rev 128025)
@@ -1,5 +1,22 @@
2012-09-10 Christophe Dumez <[email protected]>
+ [EFL] Several fast/block test cases need rebaseline after r127163
+ https://bugs.webkit.org/show_bug.cgi?id=96237
+
+ Unreviewed EFL gardening.
+
+ Rebaseline 4 fast/block test cases due to r127163.
+
+ * platform/efl/TestExpectations:
+ * platform/efl/fast/block/float/024-expected.png:
+ * platform/efl/fast/block/float/024-expected.txt:
+ * platform/efl/fast/block/margin-collapse/025-expected.txt:
+ * platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt:
+ * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.png:
+ * platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt:
+
+2012-09-10 Christophe Dumez <[email protected]>
+
[EFL] Add baseline for css3/masking test cases
https://bugs.webkit.org/show_bug.cgi?id=96235
Modified: trunk/LayoutTests/platform/efl/TestExpectations (128024 => 128025)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-09-10 07:56:43 UTC (rev 128025)
@@ -1049,12 +1049,6 @@
// Fails after r127035.
BUGWK95428 : media/video-controls-captions.html = TEXT
-//Require rebaseline after https://bugs.webkit.org/show_bug.cgi?id=80394
-BUGWK80394 : fast/block/margin-collapse/empty-clear-blocks.html = TEXT IMAGE+TEXT
-BUGWK80394 : fast/block/float/024.html = TEXT IMAGE+TEXT
-BUGWK80394 : fast/block/margin-collapse/025.html = TEXT
-BUGWK80394 : fast/block/margin-collapse/block-inside-inline/025.html = TEXT
-
// Started failing on JSC ports after r127202.
BUGWK95530 : http/tests/security/inactive-document-with-empty-security-origin.html = TEXT
Modified: trunk/LayoutTests/platform/efl/fast/block/float/024-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/efl/fast/block/float/024-expected.txt (128024 => 128025)
--- trunk/LayoutTests/platform/efl/fast/block/float/024-expected.txt 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/platform/efl/fast/block/float/024-expected.txt 2012-09-10 07:56:43 UTC (rev 128025)
@@ -12,13 +12,13 @@
text run at (2,2) width 451: "There should be a gap between this float and the green rectangle above."
RenderBlock {DIV} at (0,221) size 800x54 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
RenderBlock (floating) {DIV} at (2,2) size 32x32 [bgcolor=#FFFFFF]
- RenderBlock {DIV} at (2,34) size 796x0
+ RenderBlock {DIV} at (2,18) size 796x0
RenderBlock (anonymous) at (2,34) size 796x18
RenderText {#text} at (0,0) size 483x19
text run at (0,0) width 483: "This text should be inside a black rectangle and below the 2em white square."
- RenderBlock {DIV} at (0,291) size 800x54 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
+ RenderBlock {DIV} at (0,291) size 800x70 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
RenderBlock (floating) {DIV} at (2,2) size 32x32 [bgcolor=#FFFFFF]
- RenderBlock {DIV} at (2,34) size 796x0
- RenderBlock (anonymous) at (2,34) size 796x18
+ RenderBlock {DIV} at (2,50) size 796x0
+ RenderBlock (anonymous) at (2,50) size 796x18
RenderText {#text} at (0,0) size 512x19
text run at (0,0) width 512: "This text should also be inside a black rectangle and below the 2em white square."
Modified: trunk/LayoutTests/platform/efl/fast/block/margin-collapse/025-expected.txt (128024 => 128025)
--- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/025-expected.txt 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/platform/efl/fast/block/margin-collapse/025-expected.txt 2012-09-10 07:56:43 UTC (rev 128025)
@@ -12,7 +12,7 @@
RenderTableCell {TD} at (16,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
RenderBlock {DIV} at (3,3) size 128x128 [bgcolor=#00FF00]
RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
- RenderBlock {DIV} at (0,64) size 128x0 [bgcolor=#FF0000]
+ RenderBlock {DIV} at (0,48) size 128x0 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,64) size 128x64 [border: (32px solid #FFFF00)]
RenderTableCell {TD} at (166,16) size 134x134 [bgcolor=#FF0000] [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
RenderTable {TABLE} at (3,3) size 128x128
Modified: trunk/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt (128024 => 128025)
--- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/025-expected.txt 2012-09-10 07:56:43 UTC (rev 128025)
@@ -15,8 +15,8 @@
RenderBlock (floating) {DIV} at (0,0) size 64x64 [bgcolor=#00FFFF]
RenderInline {SPAN} at (0,0) size 0x0
RenderBlock (anonymous) at (0,0) size 128x48
- RenderBlock {DIV} at (0,64) size 128x0 [bgcolor=#FF0000]
- RenderBlock (anonymous) at (0,64) size 128x0
+ RenderBlock {DIV} at (0,48) size 128x0 [bgcolor=#FF0000]
+ RenderBlock (anonymous) at (0,48) size 128x0
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderInline {SPAN} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt (128024 => 128025)
--- trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt 2012-09-10 07:54:09 UTC (rev 128024)
+++ trunk/LayoutTests/platform/efl/fast/block/margin-collapse/empty-clear-blocks-expected.txt 2012-09-10 07:56:43 UTC (rev 128025)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x1110
+layer at (0,0) size 785x1130
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1110
- RenderBlock {HTML} at (0,0) size 785x1110
- RenderBody {BODY} at (8,8) size 769x1094
+layer at (0,0) size 785x1130
+ RenderBlock {HTML} at (0,0) size 785x1130
+ RenderBody {BODY} at (8,8) size 769x1114
RenderBlock {SPAN} at (0,0) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
@@ -11,12 +11,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,100) size 769x0
- RenderBlock {SPAN} at (0,100) size 769x18
+ RenderBlock {SPAN} at (0,75) size 769x0
+ RenderBlock {SPAN} at (0,105) size 769x18
RenderText {#text} at (0,0) size 300x19
text run at (0,0) width 300: "This text should be immediately under the float."
- RenderBlock {HR} at (0,126) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,136) size 769x18
+ RenderBlock {HR} at (0,131) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,141) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
text run at (0,0) width 85: "This is a float"
@@ -24,12 +24,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,236) size 769x0
- RenderBlock {SPAN} at (0,246) size 769x18
+ RenderBlock {SPAN} at (0,216) size 769x0
+ RenderBlock {SPAN} at (0,256) size 769x18
RenderText {#text} at (0,0) size 255x19
text run at (0,0) width 255: "This text should be 10px under the float."
- RenderBlock {HR} at (0,272) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,282) size 769x18
+ RenderBlock {HR} at (0,282) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,292) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
text run at (0,0) width 85: "This is a float"
@@ -37,12 +37,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,382) size 769x0
- RenderBlock {SPAN} at (0,382) size 769x18
- RenderText {#text} at (0,0) size 300x19
- text run at (0,0) width 300: "This text should be immediately under the float."
- RenderBlock {HR} at (0,408) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,418) size 769x18
+ RenderBlock {SPAN} at (0,362) size 769x0
+ RenderBlock {SPAN} at (0,362) size 769x18
+ RenderText {#text} at (100,0) size 268x19
+ text run at (100,0) width 268: "This text should be to the right of the float."
+ RenderBlock {HR} at (100,388) size 669x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,398) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
text run at (0,0) width 85: "This is a float"
@@ -50,12 +50,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,518) size 769x0
- RenderBlock {SPAN} at (0,518) size 769x18
+ RenderBlock {SPAN} at (0,473) size 769x0
+ RenderBlock {SPAN} at (0,503) size 769x18
RenderText {#text} at (0,0) size 300x19
text run at (0,0) width 300: "This text should be immediately under the float."
- RenderBlock {HR} at (0,544) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,554) size 769x18
+ RenderBlock {HR} at (0,529) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,539) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
text run at (0,0) width 85: "This is a float"
@@ -63,12 +63,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,654) size 769x0
- RenderBlock {SPAN} at (0,664) size 769x18
+ RenderBlock {SPAN} at (0,609) size 769x0
+ RenderBlock {SPAN} at (0,649) size 769x18
RenderText {#text} at (0,0) size 255x19
text run at (0,0) width 255: "This text should be 10px under the float."
- RenderBlock {HR} at (0,690) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,700) size 769x18
+ RenderBlock {HR} at (0,675) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,685) size 769x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
text run at (0,0) width 85: "This is a float"
@@ -76,12 +76,12 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (0,800) size 769x0
- RenderBlock {SPAN} at (0,800) size 769x18
- RenderText {#text} at (0,0) size 300x19
- text run at (0,0) width 300: "This text should be immediately under the float."
- RenderBlock {HR} at (0,826) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,836) size 769x120 [border: (10px dotted #000000)]
+ RenderBlock {SPAN} at (0,815) size 769x0
+ RenderBlock {SPAN} at (0,815) size 769x18
+ RenderText {#text} at (0,0) size 255x19
+ text run at (0,0) width 255: "This text should be 20px under the float."
+ RenderBlock {HR} at (0,841) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,851) size 769x125 [border: (10px dotted #000000)]
RenderBlock {SPAN} at (10,10) size 749x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
@@ -90,9 +90,9 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (10,110) size 749x0
- RenderBlock {HR} at (0,964) size 769x2 [border: (1px inset #000000)]
- RenderBlock {SPAN} at (0,974) size 769x120 [border: (10px dotted #000000)]
+ RenderBlock {SPAN} at (10,85) size 749x0
+ RenderBlock {HR} at (0,984) size 769x2 [border: (1px inset #000000)]
+ RenderBlock {SPAN} at (0,994) size 769x120 [border: (10px dotted #000000)]
RenderBlock {SPAN} at (10,10) size 749x18
RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#00FF00]
RenderText {#text} at (0,0) size 85x55
@@ -101,4 +101,4 @@
text run at (0,36) width 32: "high."
RenderText {#text} at (100,0) size 284x19
text run at (100,0) width 284: "This paragraph has a bottom margin of 50px."
- RenderBlock {SPAN} at (10,110) size 749x0
+ RenderBlock {SPAN} at (10,140) size 749x0
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-changes
