Recent svg/foreignObject tests failing on Mac & Win

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

Patch by Florin Malita <fmalita@google.com> on 2011-11-16
Reviewed by Simon Fraser.

Drop unnecessary text elements from the svg/FO tests to avoid platform font size variance.

* platform/chromium-cg-mac-snowleopard/svg/foreignObject/clip-expected.png: Removed.
* platform/chromium-cg-mac-snowleopard/svg/foreignObject/filter-expected.png: Removed.
* platform/chromium-cg-mac-snowleopard/svg/foreignObject/mask-expected.png: Removed.
* platform/chromium-win/svg/foreignObject/background-render-phase-expected.txt: Removed.
* platform/chromium-win/svg/foreignObject/clip-expected.txt: Removed.
* platform/chromium-win/svg/foreignObject/filter-expected.txt: Removed.
* platform/chromium-win/svg/foreignObject/mask-expected.txt: Removed.
* platform/chromium/svg/foreignObject/background-render-phase-expected.txt: Removed.
* platform/chromium/svg/foreignObject/clip-expected.txt: Removed.
* platform/chromium/svg/foreignObject/filter-expected.txt: Removed.
* platform/chromium/svg/foreignObject/mask-expected.txt: Removed.
* platform/mac-snowleopard/svg/foreignObject/multiple-foreign-objects-expected.txt: Removed.
* platform/qt/svg/foreignObject/background-render-phase-expected.png: Removed.
* platform/qt/svg/foreignObject/background-render-phase-expected.txt: Removed.
* platform/qt/svg/foreignObject/clip-expected.png: Removed.
* platform/qt/svg/foreignObject/clip-expected.txt: Removed.
* platform/qt/svg/foreignObject/filter-expected.png: Removed.
* platform/qt/svg/foreignObject/filter-expected.txt: Removed.
* platform/qt/svg/foreignObject/mask-expected.png: Removed.
* platform/qt/svg/foreignObject/mask-expected.txt: Removed.
* platform/qt/svg/foreignObject/multiple-foreign-objects-expected.png: Removed.
* platform/qt/svg/foreignObject/multiple-foreign-objects-expected.txt: Removed.
* svg/foreignObject/background-render-phase-expected.txt:
* svg/foreignObject/background-render-phase.html:
* svg/foreignObject/clip-expected.png:
* svg/foreignObject/clip-expected.txt:
* svg/foreignObject/clip.html:
* svg/foreignObject/filter-expected.png:
* svg/foreignObject/filter-expected.txt:
* svg/foreignObject/filter.html:
* svg/foreignObject/mask-expected.png:
* svg/foreignObject/mask-expected.txt:
* svg/foreignObject/mask.html:
* svg/foreignObject/multiple-foreign-objects-expected.txt:
* svg/foreignObject/multiple-foreign-objects.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 333081c85969238c81259ec90a9e224c0fef82ce..78d6bd556fed94ef5f1754aec2821a197e1c2580 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,48 @@
+2011-11-16  Florin Malita  <fmalita@google.com>
+
+        Recent svg/foreignObject tests failing on Mac & Win
+        https://bugs.webkit.org/show_bug.cgi?id=72386
+
+        Reviewed by Simon Fraser.
+
+        Drop unnecessary text elements from the svg/FO tests to avoid platform font size variance.
+
+        * platform/chromium-cg-mac-snowleopard/svg/foreignObject/clip-expected.png: Removed.
+        * platform/chromium-cg-mac-snowleopard/svg/foreignObject/filter-expected.png: Removed.
+        * platform/chromium-cg-mac-snowleopard/svg/foreignObject/mask-expected.png: Removed.
+        * platform/chromium-win/svg/foreignObject/background-render-phase-expected.txt: Removed.
+        * platform/chromium-win/svg/foreignObject/clip-expected.txt: Removed.
+        * platform/chromium-win/svg/foreignObject/filter-expected.txt: Removed.
+        * platform/chromium-win/svg/foreignObject/mask-expected.txt: Removed.
+        * platform/chromium/svg/foreignObject/background-render-phase-expected.txt: Removed.
+        * platform/chromium/svg/foreignObject/clip-expected.txt: Removed.
+        * platform/chromium/svg/foreignObject/filter-expected.txt: Removed.
+        * platform/chromium/svg/foreignObject/mask-expected.txt: Removed.
+        * platform/mac-snowleopard/svg/foreignObject/multiple-foreign-objects-expected.txt: Removed.
+        * platform/qt/svg/foreignObject/background-render-phase-expected.png: Removed.
+        * platform/qt/svg/foreignObject/background-render-phase-expected.txt: Removed.
+        * platform/qt/svg/foreignObject/clip-expected.png: Removed.
+        * platform/qt/svg/foreignObject/clip-expected.txt: Removed.
+        * platform/qt/svg/foreignObject/filter-expected.png: Removed.
+        * platform/qt/svg/foreignObject/filter-expected.txt: Removed.
+        * platform/qt/svg/foreignObject/mask-expected.png: Removed.
+        * platform/qt/svg/foreignObject/mask-expected.txt: Removed.
+        * platform/qt/svg/foreignObject/multiple-foreign-objects-expected.png: Removed.
+        * platform/qt/svg/foreignObject/multiple-foreign-objects-expected.txt: Removed.
+        * svg/foreignObject/background-render-phase-expected.txt:
+        * svg/foreignObject/background-render-phase.html:
+        * svg/foreignObject/clip-expected.png:
+        * svg/foreignObject/clip-expected.txt:
+        * svg/foreignObject/clip.html:
+        * svg/foreignObject/filter-expected.png:
+        * svg/foreignObject/filter-expected.txt:
+        * svg/foreignObject/filter.html:
+        * svg/foreignObject/mask-expected.png:
+        * svg/foreignObject/mask-expected.txt:
+        * svg/foreignObject/mask.html:
+        * svg/foreignObject/multiple-foreign-objects-expected.txt:
+        * svg/foreignObject/multiple-foreign-objects.html:
+
 2011-11-16  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: Application cache status should be updated after swapCache().

diff --git a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/clip-expected.png b/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/clip-expected.png
deleted file mode 100644 (file)
index 8a5ec6e..0000000
Binary files a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/clip-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/filter-expected.png b/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/filter-expected.png
deleted file mode 100644 (file)
index 8a5ec6e..0000000
Binary files a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/filter-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/mask-expected.png b/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/mask-expected.png
deleted file mode 100644 (file)
index 8a5ec6e..0000000
Binary files a/LayoutTests/platform/chromium-cg-mac-snowleopard/svg/foreignObject/mask-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/background-render-phase-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/background-render-phase-expected.txt
deleted file mode 100644 (file)
index 34c3b83..0000000
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/background-render-phase-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x50
-        RenderSVGPath {rect} at (0,0) size 100x50 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x50
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/clip-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/clip-expected.txt
deleted file mode 100644 (file)
index 4d654fd..0000000
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/clip-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/filter-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/filter-expected.txt
deleted file mode 100644 (file)
index c7799fd..0000000
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/filter-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
-            [feColorMatrix type="MATRIX" values="1.00 0.00 0.00 0.00 0.00 1.00 1.00 0.00 0.00 0.00 1.00 0.00 1.00 0.00 0.00 0.00 0.00 0.00 1.00 0.00"]
-              [SourceGraphic]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/mask-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/mask-expected.txt
deleted file mode 100644 (file)
index bd46017..0000000
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/mask-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium/svg/foreignObject/background-render-phase-expected.txt b/LayoutTests/platform/chromium/svg/foreignObject/background-render-phase-expected.txt
deleted file mode 100644 (file)
index 69fc095..0000000
--- a/LayoutTests/platform/chromium/svg/foreignObject/background-render-phase-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x50
-        RenderSVGPath {rect} at (0,0) size 100x50 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x50
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium/svg/foreignObject/clip-expected.txt b/LayoutTests/platform/chromium/svg/foreignObject/clip-expected.txt
deleted file mode 100644 (file)
index a745dab..0000000
--- a/LayoutTests/platform/chromium/svg/foreignObject/clip-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium/svg/foreignObject/filter-expected.txt b/LayoutTests/platform/chromium/svg/foreignObject/filter-expected.txt
deleted file mode 100644 (file)
index f7663f3..0000000
--- a/LayoutTests/platform/chromium/svg/foreignObject/filter-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
-            [feColorMatrix type="MATRIX" values="1.00 0.00 0.00 0.00 0.00 1.00 1.00 0.00 0.00 0.00 1.00 0.00 1.00 0.00 0.00 0.00 0.00 0.00 1.00 0.00"]
-              [SourceGraphic]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/chromium/svg/foreignObject/mask-expected.txt b/LayoutTests/platform/chromium/svg/foreignObject/mask-expected.txt
deleted file mode 100644 (file)
index c22539d..0000000
--- a/LayoutTests/platform/chromium/svg/foreignObject/mask-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac-snowleopard/svg/foreignObject/multiple-foreign-objects-expected.txt b/LayoutTests/platform/mac-snowleopard/svg/foreignObject/multiple-foreign-objects-expected.txt
deleted file mode 100644 (file)
index d6f75f2..0000000
--- a/LayoutTests/platform/mac-snowleopard/svg/foreignObject/multiple-foreign-objects-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 400x100
-        RenderSVGForeignObject {foreignObject} at (0,0) size 100x100
-          RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x18
-              text run at (0,0) width 4: " "
-        RenderSVGForeignObject {foreignObject} at (150,0) size 100x100
-          RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.png b/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.png
deleted file mode 100644 (file)
index 4dba841..0000000
Binary files a/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.txt
deleted file mode 100644 (file)
index ebe1f1b..0000000
--- a/LayoutTests/platform/qt/svg/foreignObject/background-render-phase-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x50
-        RenderSVGPath {rect} at (0,0) size 100x50 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x50
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/foreignObject/clip-expected.png b/LayoutTests/platform/qt/svg/foreignObject/clip-expected.png
deleted file mode 100644 (file)
index d829da4..0000000
Binary files a/LayoutTests/platform/qt/svg/foreignObject/clip-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/qt/svg/foreignObject/clip-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/clip-expected.txt
deleted file mode 100644 (file)
index 3605153..0000000
--- a/LayoutTests/platform/qt/svg/foreignObject/clip-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/foreignObject/filter-expected.png b/LayoutTests/platform/qt/svg/foreignObject/filter-expected.png
deleted file mode 100644 (file)
index d829da4..0000000
Binary files a/LayoutTests/platform/qt/svg/foreignObject/filter-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/qt/svg/foreignObject/filter-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/filter-expected.txt
deleted file mode 100644 (file)
index 8142dc5..0000000
--- a/LayoutTests/platform/qt/svg/foreignObject/filter-expected.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
-            [feColorMatrix type="MATRIX" values="1.00 0.00 0.00 0.00 0.00 1.00 1.00 0.00 0.00 0.00 1.00 0.00 1.00 0.00 0.00 0.00 0.00 0.00 1.00 0.00"]
-              [SourceGraphic]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/foreignObject/mask-expected.png b/LayoutTests/platform/qt/svg/foreignObject/mask-expected.png
deleted file mode 100644 (file)
index d829da4..0000000
Binary files a/LayoutTests/platform/qt/svg/foreignObject/mask-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/qt/svg/foreignObject/mask-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/mask-expected.txt
deleted file mode 100644 (file)
index 75b607b..0000000
--- a/LayoutTests/platform/qt/svg/foreignObject/mask-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 200x100
-        RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-          RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
-            RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
-        RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-          RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.png b/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.png
deleted file mode 100644 (file)
index c1e0895..0000000
Binary files a/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.txt
deleted file mode 100644 (file)
index 2b3feba..0000000
--- a/LayoutTests/platform/qt/svg/foreignObject/multiple-foreign-objects-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 (0,0) size 800x600
-      RenderSVGRoot {svg} at (0,0) size 400x100
-        RenderSVGForeignObject {foreignObject} at (0,0) size 100x100
-          RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x21
-              text run at (0,0) width 4: " "
-        RenderSVGForeignObject {foreignObject} at (150,0) size 100x100
-          RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-      RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/background-render-phase-expected.txt b/LayoutTests/svg/foreignObject/background-render-phase-expected.txt
index 34c3b83e9c0b83228132d935e4685e880c76b24e..3efe7d3bd00854cca8dfeb83a9997fdae6ddd658 100644 (file)
--- a/LayoutTests/svg/foreignObject/background-render-phase-expected.txt
+++ b/LayoutTests/svg/foreignObject/background-render-phase-expected.txt
@@ -7,6 +7,4 @@ layer at (0,0) size 800x600
         RenderSVGPath {rect} at (0,0) size 100x50 [fill={[type=SOLID] [color=#FF0000]}] [x=0.00] [y=0.00] [width=100.00] [height=50.00]
         RenderSVGForeignObject {foreignObject} at (0,0) size 200x50
           RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/background-render-phase.html b/LayoutTests/svg/foreignObject/background-render-phase.html
index e2aa2bf5ada41cf98119c49afd6b6f37b6659074..6906691d4ce83947962caafbb84e99cc8fc9af70 100644 (file)
--- a/LayoutTests/svg/foreignObject/background-render-phase.html
+++ b/LayoutTests/svg/foreignObject/background-render-phase.html
@@ -5,8 +5,8 @@
 <rect x="0" y="0" width="100" height="50" fill="red"></rect>
 <foreignObject x="0" y="0" width="200" height="50">
     <html xmlns="http://www.w3.org/1999/xhtml">
-    <body style="dmargin: 0;">
-        <div style="background: green; height: 50px;">&nbsp;</div>
+    <body>
+        <div style="background: green; height: 50px;"></div>
     </body>
     </html>
 </foreignObject>

diff --git a/LayoutTests/svg/foreignObject/clip-expected.png b/LayoutTests/svg/foreignObject/clip-expected.png
index 2ad1e2df93b807a3329120a328b47b0bfa94830c..966c340c223a5e7fa0e667590bee15d5a323e3ab 100644 (file)
Binary files a/LayoutTests/svg/foreignObject/clip-expected.png and b/LayoutTests/svg/foreignObject/clip-expected.png differ

diff --git a/LayoutTests/svg/foreignObject/clip-expected.txt b/LayoutTests/svg/foreignObject/clip-expected.txt
index 4d654fded586f18342a50297734b7c765bd6ea48..755fed95a4d1b6014eaa77f531ae9d614b174ed4 100644 (file)
--- a/LayoutTests/svg/foreignObject/clip-expected.txt
+++ b/LayoutTests/svg/foreignObject/clip-expected.txt
@@ -8,10 +8,6 @@ layer at (0,0) size 800x600
           RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
             RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
         RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
+          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
           RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/clip.html b/LayoutTests/svg/foreignObject/clip.html
index 0a632743de67b3159ede04f7947363f1e72996fa..782ff4d79a034af50dccd081db3f4d0f55df882b 100644 (file)
--- a/LayoutTests/svg/foreignObject/clip.html
+++ b/LayoutTests/svg/foreignObject/clip.html
@@ -9,9 +9,9 @@
 </defs>
 <foreignObject width="200" height="100" clip-path="url(#clip)" opacity=".5">
     <html xmlns="http://www.w3.org/1999/xhtml">
-    <body style="dmargin: 0;">
-        <div style="background: #00ff00; height: 50px;">&nbsp;</div>
-        <div style="background: red; height: 50px;">&nbsp;</div>
+    <body>
+        <div style="background: green; height: 50px;"></div>
+        <div style="background: red; height: 50px;"></div>
     </body>
     </html>
 </foreignObject>

diff --git a/LayoutTests/svg/foreignObject/filter-expected.png b/LayoutTests/svg/foreignObject/filter-expected.png
index 2ad1e2df93b807a3329120a328b47b0bfa94830c..2c88bc3379b7d76d7db6c084a55d407431187f8d 100644 (file)
Binary files a/LayoutTests/svg/foreignObject/filter-expected.png and b/LayoutTests/svg/foreignObject/filter-expected.png differ

diff --git a/LayoutTests/svg/foreignObject/filter-expected.txt b/LayoutTests/svg/foreignObject/filter-expected.txt
index c7799fd04423a05823c20a3a87c3f440ac59d187..f15d2013da25d35c753d0a904f6548db4144667d 100644 (file)
--- a/LayoutTests/svg/foreignObject/filter-expected.txt
+++ b/LayoutTests/svg/foreignObject/filter-expected.txt
@@ -9,10 +9,6 @@ layer at (0,0) size 800x600
             [feColorMatrix type="MATRIX" values="1.00 0.00 0.00 0.00 0.00 1.00 1.00 0.00 0.00 0.00 1.00 0.00 1.00 0.00 0.00 0.00 0.00 0.00 1.00 0.00"]
               [SourceGraphic]
         RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
+          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
           RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/filter.html b/LayoutTests/svg/foreignObject/filter.html
index 1b77953c089a93946a74cbe3dc9cf10556a0aff4..b74f5e0c4ef56537c29508a68c9b917be0d1cc1b 100644 (file)
--- a/LayoutTests/svg/foreignObject/filter.html
+++ b/LayoutTests/svg/foreignObject/filter.html
@@ -9,9 +9,9 @@
 </defs>
 <foreignObject width="200" height="100" filter="url(#filter)" opacity=".5">
     <html xmlns="http://www.w3.org/1999/xhtml">
-    <body style="dmargin: 0;">
-        <div style="background: #00ff00; height: 50px;">&nbsp;</div>
-        <div style="background: #ff0000; height: 50px;">&nbsp;</div>
+    <body>
+        <div style="background: green; height: 50px;"></div>
+        <div style="background: red; height: 50px;"></div>
     </body>
     </html>
 </foreignObject>

diff --git a/LayoutTests/svg/foreignObject/mask-expected.png b/LayoutTests/svg/foreignObject/mask-expected.png
index 2ad1e2df93b807a3329120a328b47b0bfa94830c..966c340c223a5e7fa0e667590bee15d5a323e3ab 100644 (file)
Binary files a/LayoutTests/svg/foreignObject/mask-expected.png and b/LayoutTests/svg/foreignObject/mask-expected.png differ

diff --git a/LayoutTests/svg/foreignObject/mask-expected.txt b/LayoutTests/svg/foreignObject/mask-expected.txt
index bd46017a6d00829a55fd5c532775d75545361e2a..982c4c3d803c743d809ccb00477990ccb28bba2d 100644 (file)
--- a/LayoutTests/svg/foreignObject/mask-expected.txt
+++ b/LayoutTests/svg/foreignObject/mask-expected.txt
@@ -8,10 +8,6 @@ layer at (0,0) size 800x600
           RenderSVGResourceMasker {mask} [id="mask"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
             RenderSVGPath {rect} at (0,0) size 200x50 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=200.00] [height=50.00]
         RenderSVGForeignObject {foreignObject} at (0,0) size 200x100
-          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#00FF00]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
+          RenderBlock {DIV} at (0,0) size 200x50 [bgcolor=#008000]
           RenderBlock {DIV} at (0,50) size 200x50 [bgcolor=#FF0000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/mask.html b/LayoutTests/svg/foreignObject/mask.html
index 4b73457fb4fd9e87688d2b688043a093d73f5539..535bf5cc71d916cf407fa8ff286b6bcf49041b78 100644 (file)
--- a/LayoutTests/svg/foreignObject/mask.html
+++ b/LayoutTests/svg/foreignObject/mask.html
@@ -9,9 +9,9 @@
 </defs>
 <foreignObject width="200" height="100" mask="url(#mask)" opacity=".5">
     <html xmlns="http://www.w3.org/1999/xhtml">
-    <body style="dmargin: 0;">
-        <div style="background: #00ff00; height: 50px;">&nbsp;</div>
-        <div style="background: red; height: 50px;">&nbsp;</div>
+    <body>
+        <div style="background: green; height: 50px;"></div>
+        <div style="background: red; height: 50px;"></div>
     </body>
     </html>
 </foreignObject>

diff --git a/LayoutTests/svg/foreignObject/multiple-foreign-objects-expected.txt b/LayoutTests/svg/foreignObject/multiple-foreign-objects-expected.txt
index 398436e2fb7e840bb89750514a42b888abd53fbb..26f2664e7e5b78c02894baa5a5921ca997f31dac 100644 (file)
--- a/LayoutTests/svg/foreignObject/multiple-foreign-objects-expected.txt
+++ b/LayoutTests/svg/foreignObject/multiple-foreign-objects-expected.txt
@@ -6,8 +6,6 @@ layer at (0,0) size 800x600
       RenderSVGRoot {svg} at (0,0) size 400x100
         RenderSVGForeignObject {foreignObject} at (0,0) size 100x100
           RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-            RenderText {#text} at (0,0) size 4x19
-              text run at (0,0) width 4: " "
         RenderSVGForeignObject {foreignObject} at (150,0) size 100x100
           RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/foreignObject/multiple-foreign-objects.html b/LayoutTests/svg/foreignObject/multiple-foreign-objects.html
index 9f46a4478355c1cc3cafe0691e7585a3bb13b519..b9e1017f0c6fbf3c3a74245ba71786d1bc793f78 100644 (file)
--- a/LayoutTests/svg/foreignObject/multiple-foreign-objects.html
+++ b/LayoutTests/svg/foreignObject/multiple-foreign-objects.html
@@ -5,7 +5,7 @@
 <foreignObject width="100" height="100">
     <html xmlns="http://www.w3.org/1999/xhtml">
     <body>
-        <div style="background: green; width: 100px; height: 100px;">&nbsp;</div>
+        <div style="background: green; width: 100px; height: 100px;"></div>
     </body>
     </html>
 </foreignObject>