[EFL] Rebaseline needed after r121296 and r121599

https://bugs.webkit.org/show_bug.cgi?id=90364

Unreviewed EFL gardening. Update baselines for a few
test cases after r121296 and r121599.

Patch by Christophe Dumez <christophe.dumez@intel.com> on 2012-07-02

* platform/efl/TestExpectations:
* platform/efl/fast/backgrounds/size/zero-expected.png:
* platform/efl/fast/backgrounds/size/zero-expected.txt:
* platform/efl/fast/transforms/bounding-rect-zoom-expected.png:
* platform/efl/fast/transforms/bounding-rect-zoom-expected.txt: Added.
* platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png:
* platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bda5f20..6a6a808 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,21 @@
 2012-07-02  Christophe Dumez  <christophe.dumez@intel.com>
 
+        [EFL] Rebaseline needed after r121296 and r121599
+        https://bugs.webkit.org/show_bug.cgi?id=90364
+
+        Unreviewed EFL gardening. Update baselines for a few
+        test cases after r121296 and r121599.
+
+        * platform/efl/TestExpectations:
+        * platform/efl/fast/backgrounds/size/zero-expected.png:
+        * platform/efl/fast/backgrounds/size/zero-expected.txt:
+        * platform/efl/fast/transforms/bounding-rect-zoom-expected.png:
+        * platform/efl/fast/transforms/bounding-rect-zoom-expected.txt: Added.
+        * platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png:
+        * platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt:
+
+2012-07-02  Christophe Dumez  <christophe.dumez@intel.com>
+
         [EFL] Skip fast/js/navigator-language.html
         https://bugs.webkit.org/show_bug.cgi?id=90365
 

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index 1b6c6e7..8c1fcda 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -707,9 +707,6 @@ BUGWK86722 SKIP : fast/images/paletted-png-with-color-profile.html = PASS
 BUGWK88729 SKIP : userscripts/window-onerror-for-isolated-world-1.html = PASS
 BUGWK88729 SKIP : userscripts/window-onerror-for-isolated-world-2.html = PASS
 
-// Needs Rebaseline after bug 86942
-BUGWK86942 : fast/backgrounds/size/zero.html = IMAGE+TEXT
-
 // These tests do not seem to fail anywhere else.
 BUGWK88031 : fast/multicol/span/generated-child-split-flow-crash.html = TEXT
 

diff --git a/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.png b/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.png
index b295c6c..36464fa 100644 (file)
Binary files a/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.png and b/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.png differ

diff --git a/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.txt b/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.txt
index 6060817..7d77f1b 100644 (file)
--- a/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.txt
+++ b/LayoutTests/platform/efl/fast/backgrounds/size/zero-expected.txt
@@ -15,8 +15,8 @@ layer at (0,0) size 800x600
         RenderText {#text} at (580,0) size 4x19
           text run at (580,0) width 4: "."
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 558x19
-          text run at (0,0) width 558: "There should be four blue squares with black borders. WebKit should not hang or assert."
+        RenderText {#text} at (0,0) size 570x19
+          text run at (0,0) width 570: "There should be four empty squares with black borders. WebKit should not hang or assert."
       RenderBlock {DIV} at (8,68) size 106x106 [border: (3px solid #000000)]
       RenderBlock {DIV} at (8,182) size 106x106 [border: (3px solid #000000)]
       RenderBlock {DIV} at (8,296) size 106x106 [border: (3px solid #000000)]

diff --git a/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.png b/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.png
index 72de248..476c9da 100644 (file)
Binary files a/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.png and b/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.png differ

diff --git a/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.txt b/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.txt
new file mode 100644 (file)
index 0000000..029833c
--- /dev/null
+++ b/LayoutTests/platform/efl/fast/transforms/bounding-rect-zoom-expected.txt
@@ -0,0 +1,46 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (7,7) size 786x586
+      RenderBlock {P} at (0,0) size 786x32
+        RenderText {#text} at (0,0) size 303x17
+          text run at (0,0) width 303: "Tests that these functions account for full page zoom."
+        RenderBR {BR} at (303,13) size 0x0
+        RenderText {#text} at (0,16) size 176x17
+          text run at (0,16) width 176: "There should be no red visible."
+      RenderTable {TABLE} at (0,46) size 786x18
+        RenderTableSection {TBODY} at (0,0) size 786x18
+          RenderTableRow {TR} at (0,1) size 786x16
+            RenderTableCell {TD} at (1,1) size 180x16 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 145x17
+                text run at (0,0) width 145: "getClientBoundingRect():"
+              RenderText {#text} at (0,0) size 0x0
+              RenderText {#text} at (0,0) size 0x0
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (182,1) size 603x16 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 95x17
+                text run at (0,0) width 95: "getClientRects():"
+              RenderText {#text} at (0,0) size 0x0
+              RenderText {#text} at (0,0) size 0x0
+              RenderText {#text} at (0,0) size 0x0
+layer at (90,90) size 90x90
+  RenderBlock (positioned) {DIV} at (90,90) size 90x90 [bgcolor=#FF0000]
+layer at (90,90) size 90x90
+  RenderBlock (positioned) {DIV} at (90,90) size 90x90 [bgcolor=#008000]
+layer at (9,198) size 35x16
+  RenderBlock (positioned) {DIV} at (9,198) size 35x16
+    RenderInline {SPAN} at (0,0) size 35x17 [color=#008000]
+      RenderInline {B} at (0,0) size 35x17
+        RenderText {#text} at (0,0) size 35x17
+          text run at (0,0) width 35: "PASS"
+layer at (270,90) size 90x90
+  RenderBlock (positioned) {DIV} at (270,90) size 90x90 [bgcolor=#FF0000]
+layer at (270,90) size 90x90
+  RenderBlock (positioned) {DIV} at (270,90) size 90x90 [bgcolor=#008000]
+layer at (198,198) size 35x16
+  RenderBlock (positioned) {DIV} at (198,198) size 35x16
+    RenderInline {SPAN} at (0,0) size 35x17 [color=#008000]
+      RenderInline {B} at (0,0) size 35x17
+        RenderText {#text} at (0,0) size 35x17
+          text run at (0,0) width 35: "PASS"

diff --git a/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
index 7c2c94f..3ea2f5a 100644 (file)
Binary files a/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png and b/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png differ

diff --git a/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt b/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt
index e83074e..bc5eddb 100644 (file)
--- a/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt
+++ b/LayoutTests/platform/efl/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt
@@ -1,62 +1,62 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x411
-  RenderBlock {HTML} at (0,0) size 800x411
-    RenderBody {BODY} at (4,4) size 122x400 [border: (1px dashed #C0C0C0)]
+layer at (0,0) size 800x391
+  RenderBlock {HTML} at (0,0) size 800x391
+    RenderBody {BODY} at (4,4) size 122x380 [border: (1px dashed #C0C0C0)]
       RenderBlock {P} at (1,9) size 120x24
         RenderText {#text} at (0,-1) size 119x26
           text run at (0,-1) width 111: "The following six blue boxes must"
           text run at (0,7) width 119: "be of the same width. There must be"
           text run at (0,15) width 23: "no red."
-      RenderBlock {P} at (9,41) size 104x24 [bgcolor=#008000] [border: (8px solid #0000FF)]
-        RenderText {#text} at (8,7) size 2x10
-          text run at (8,7) width 2: " "
-      RenderBlock {P} at (1,113) size 120x8
+      RenderBlock {P} at (9,41) size 104x16 [bgcolor=#008000] [border: (4px solid #0000FF)]
+        RenderText {#text} at (4,3) size 2x10
+          text run at (4,3) width 2: " "
+      RenderBlock {P} at (1,105) size 120x8
         RenderText {#text} at (0,-1) size 12x10
           text run at (0,-1) width 12: "      "
         RenderText {#text} at (0,0) size 0x0
-        RenderEmbeddedObject {OBJECT} at (8,0) size 104x38 [bgcolor=#FF0000] [border: (8px solid #0000FF)]
-          layer at (0,0) size 88x22
-            RenderView at (0,0) size 88x22
-          layer at (0,0) size 88x22
-            RenderSVGRoot {svg} at (0,0) size 88x22
-              RenderSVGRect {rect} at (0,0) size 88x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
-              RenderSVGPath {path} at (13,4) size 62x14 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
-      RenderBlock {P} at (1,169) size 120x8
-        RenderEmbeddedObject {OBJECT} at (8,0) size 104x38 [bgcolor=#FF0000] [border: (8px solid #0000FF)]
-          layer at (0,0) size 88x22
-            RenderView at (0,0) size 88x22
-          layer at (0,0) size 88x22
-            RenderSVGRoot {svg} at (0,0) size 88x22
-              RenderSVGRect {rect} at (0,0) size 88x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
-              RenderSVGPath {path} at (13,4) size 62x14 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
-      RenderTable at (1,225) size 120x39
-        RenderTableSection (anonymous) at (0,0) size 120x39
-          RenderTableRow (anonymous) at (0,0) size 120x39
-            RenderTableCell {P} at (0,0) size 120x39 [r=0 c=0 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (8,0) size 104x38 [bgcolor=#FF0000] [border: (8px solid #0000FF)]
-                layer at (0,0) size 88x22
-                  RenderView at (0,0) size 88x22
-                layer at (0,0) size 88x22
-                  RenderSVGRoot {svg} at (0,0) size 88x22
-                    RenderSVGRect {rect} at (0,0) size 88x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
-                    RenderSVGPath {path} at (13,4) size 62x14 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
-      RenderTable {TABLE} at (1,312) size 120x39
-        RenderTableSection {TBODY} at (0,0) size 120x39
-          RenderTableRow {TR} at (0,0) size 120x39
-            RenderTableCell {TD} at (0,0) size 120x39 [r=0 c=0 rs=1 cs=1]
-              RenderEmbeddedObject {OBJECT} at (8,0) size 104x38 [bgcolor=#FF0000] [border: (8px solid #0000FF)]
-                layer at (0,0) size 88x22
-                  RenderView at (0,0) size 88x22
-                layer at (0,0) size 88x22
-                  RenderSVGRoot {svg} at (0,0) size 88x22
-                    RenderSVGRect {rect} at (0,0) size 88x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
-                    RenderSVGPath {path} at (13,4) size 62x14 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
-      RenderBlock (floating) {P} at (1,399) size 120x8
-        RenderEmbeddedObject {OBJECT} at (8,0) size 104x38 [bgcolor=#FF0000] [border: (8px solid #0000FF)]
-          layer at (0,0) size 88x22
-            RenderView at (0,0) size 88x22
-          layer at (0,0) size 88x22
-            RenderSVGRoot {svg} at (0,0) size 88x22
-              RenderSVGRect {rect} at (0,0) size 88x22 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
-              RenderSVGPath {path} at (13,4) size 62x14 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
+        RenderEmbeddedObject {OBJECT} at (8,0) size 104x32 [bgcolor=#FF0000] [border: (4px solid #0000FF)]
+          layer at (0,0) size 96x24
+            RenderView at (0,0) size 96x24
+          layer at (0,0) size 96x24
+            RenderSVGRoot {svg} at (0,0) size 96x24
+              RenderSVGRect {rect} at (0,0) size 96x24 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+              RenderSVGPath {path} at (14,4) size 68x16 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
+      RenderBlock {P} at (1,161) size 120x8
+        RenderEmbeddedObject {OBJECT} at (8,0) size 104x32 [bgcolor=#FF0000] [border: (4px solid #0000FF)]
+          layer at (0,0) size 96x24
+            RenderView at (0,0) size 96x24
+          layer at (0,0) size 96x24
+            RenderSVGRoot {svg} at (0,0) size 96x24
+              RenderSVGRect {rect} at (0,0) size 96x24 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+              RenderSVGPath {path} at (14,4) size 68x16 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
+      RenderTable at (1,217) size 120x33
+        RenderTableSection (anonymous) at (0,0) size 120x33
+          RenderTableRow (anonymous) at (0,0) size 120x33
+            RenderTableCell {P} at (0,0) size 120x33 [r=0 c=0 rs=1 cs=1]
+              RenderEmbeddedObject {OBJECT} at (8,0) size 104x32 [bgcolor=#FF0000] [border: (4px solid #0000FF)]
+                layer at (0,0) size 96x24
+                  RenderView at (0,0) size 96x24
+                layer at (0,0) size 96x24
+                  RenderSVGRoot {svg} at (0,0) size 96x24
+                    RenderSVGRect {rect} at (0,0) size 96x24 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+                    RenderSVGPath {path} at (14,4) size 68x16 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
+      RenderTable {TABLE} at (1,298) size 120x33
+        RenderTableSection {TBODY} at (0,0) size 120x33
+          RenderTableRow {TR} at (0,0) size 120x33
+            RenderTableCell {TD} at (0,0) size 120x33 [r=0 c=0 rs=1 cs=1]
+              RenderEmbeddedObject {OBJECT} at (8,0) size 104x32 [bgcolor=#FF0000] [border: (4px solid #0000FF)]
+                layer at (0,0) size 96x24
+                  RenderView at (0,0) size 96x24
+                layer at (0,0) size 96x24
+                  RenderSVGRoot {svg} at (0,0) size 96x24
+                    RenderSVGRect {rect} at (0,0) size 96x24 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+                    RenderSVGPath {path} at (14,4) size 68x16 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
+      RenderBlock (floating) {P} at (1,379) size 120x8
+        RenderEmbeddedObject {OBJECT} at (8,0) size 104x32 [bgcolor=#FF0000] [border: (4px solid #0000FF)]
+          layer at (0,0) size 96x24
+            RenderView at (0,0) size 96x24
+          layer at (0,0) size 96x24
+            RenderSVGRoot {svg} at (0,0) size 96x24
+              RenderSVGRect {rect} at (0,0) size 96x24 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00]
+              RenderSVGPath {path} at (14,4) size 68x16 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]