WebCore:
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Jan 2008 20:06:33 +0000 (20:06 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Jan 2008 20:06:33 +0000 (20:06 +0000)
        Reviewed by Oliver.

        Disables SVG foreign object for <rdar://problem/5686989> turn off
        SVG foreignobject because it does not repaint/dirty correctly

        * DerivedSources.make:
        * WebCore.SVG.ForeignObject.exp: Added.
        * WebCore.SVG.exp:
        * bindings/js/JSSVGElementWrapperFactory.cpp:
        (WebCore::createJSSVGWrapper):
        * rendering/RenderForeignObject.cpp:
        * rendering/RenderForeignObject.h:
        * svg/SVGForeignObjectElement.cpp:
        * svg/SVGForeignObjectElement.h:
        * svg/SVGForeignObjectElement.idl:
        * svg/SVGLocatable.cpp:
        (WebCore::SVGLocatable::nearestViewportElement):
        (WebCore::SVGLocatable::farthestViewportElement):
        * svg/SVGUseElement.cpp:
        (WebCore::isDisallowedElement):
        * svg/svgtags.in:

WebKitTools:

        Reviewed by Oliver.

        Update build-webkit to account for foreign-object being disabled by
        default.

        * Scripts/build-webkit:

LayoutTests:

        Reviewed by Oliver.

        Changed test results from disabling SVG foreign object for <rdar://
        problem/5686989> turn off SVG foreignobject because it does not
        repaint/dirty correctly

        * platform/mac/svg/custom/baseval-animval-equality-expected.checksum: Replaced.
        * platform/mac/svg/custom/baseval-animval-equality-expected.png: Replaced.
        * platform/mac/svg/custom/baseval-animval-equality-expected.txt: Replaced.
        * platform/mac/svg/custom/dominant-baseline-hanging-expected.checksum: Replaced.
        * platform/mac/svg/custom/dominant-baseline-hanging-expected.png: Replaced.
        * platform/mac/svg/custom/dominant-baseline-hanging-expected.txt: Replaced.
        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.checksum: Replaced.
        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.png: Replaced.
        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt: Replaced.
        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.checksum: Replaced.
        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.png: Replaced.
        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt: Replaced.
        * platform/mac/svg/custom/foreign-object-skew-expected.checksum: Replaced.
        * platform/mac/svg/custom/foreign-object-skew-expected.png: Replaced.
        * platform/mac/svg/custom/foreign-object-skew-expected.txt: Replaced.
        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.checksum: Replaced.
        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.png: Replaced.
        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt: Replaced.
        * platform/mac/svg/custom/getPresentationAttribute-expected.checksum: Replaced.
        * platform/mac/svg/custom/getPresentationAttribute-expected.png: Replaced.
        * platform/mac/svg/custom/getPresentationAttribute-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt: Replaced.
        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.checksum: Replaced.
        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.png: Replaced.
        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt: Replaced.
        * platform/mac/svg/hixie/mixed/006-expected.checksum: Replaced.
        * platform/mac/svg/hixie/mixed/006-expected.png: Replaced.
        * platform/mac/svg/hixie/mixed/006-expected.txt: Replaced.
        * platform/mac/svg/hixie/mixed/007-expected.checksum: Replaced.
        * platform/mac/svg/hixie/mixed/007-expected.png: Replaced.
        * platform/mac/svg/hixie/mixed/007-expected.txt: Replaced.
        * platform/mac/svg/hixie/mixed/008-expected.checksum: Replaced.
        * platform/mac/svg/hixie/mixed/008-expected.png: Replaced.
        * platform/mac/svg/hixie/mixed/008-expected.txt: Replaced.
        * platform/mac/svg/hixie/mixed/009-expected.checksum: Replaced.
        * platform/mac/svg/hixie/mixed/009-expected.png: Replaced.
        * platform/mac/svg/hixie/mixed/009-expected.txt: Replaced.
        * platform/mac/svg/hixie/mixed/011-expected.checksum: Replaced.
        * platform/mac/svg/hixie/mixed/011-expected.png: Replaced.
        * platform/mac/svg/hixie/mixed/011-expected.txt: Replaced.

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

76 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.checksum
LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.png
LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.txt
LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.checksum
LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png
LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.txt
LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.checksum
LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.png
LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt
LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.checksum
LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.png
LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt
LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.checksum
LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png
LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.txt
LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.checksum
LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.png
LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt
LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.checksum
LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.png
LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.png
LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.png
LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt
LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.checksum
LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.png
LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt
LayoutTests/platform/mac/svg/hixie/mixed/006-expected.checksum
LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png
LayoutTests/platform/mac/svg/hixie/mixed/006-expected.txt
LayoutTests/platform/mac/svg/hixie/mixed/007-expected.checksum
LayoutTests/platform/mac/svg/hixie/mixed/007-expected.png
LayoutTests/platform/mac/svg/hixie/mixed/007-expected.txt
LayoutTests/platform/mac/svg/hixie/mixed/008-expected.checksum
LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png
LayoutTests/platform/mac/svg/hixie/mixed/008-expected.txt
LayoutTests/platform/mac/svg/hixie/mixed/009-expected.checksum
LayoutTests/platform/mac/svg/hixie/mixed/009-expected.png
LayoutTests/platform/mac/svg/hixie/mixed/009-expected.txt
LayoutTests/platform/mac/svg/hixie/mixed/011-expected.checksum
LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png
LayoutTests/platform/mac/svg/hixie/mixed/011-expected.txt
WebCore/ChangeLog
WebCore/DerivedSources.make
WebCore/WebCore.SVG.ForeignObject.exp [new file with mode: 0644]
WebCore/WebCore.SVG.exp
WebCore/bindings/js/JSSVGElementWrapperFactory.cpp
WebCore/rendering/RenderForeignObject.cpp
WebCore/rendering/RenderForeignObject.h
WebCore/svg/SVGForeignObjectElement.cpp
WebCore/svg/SVGForeignObjectElement.h
WebCore/svg/SVGForeignObjectElement.idl
WebCore/svg/SVGLocatable.cpp
WebCore/svg/SVGUseElement.cpp
WebCore/svg/svgtags.in
WebKitTools/ChangeLog
WebKitTools/Scripts/build-webkit

index c2b611c93e4510da4bc212925ecb63a2b871afd6..608e378fee78960df3a3e0066a50987c359fa213 100644 (file)
@@ -1,3 +1,72 @@
+2008-01-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Oliver.
+
+        Changed test results from disabling SVG foreign object for <rdar://
+        problem/5686989> turn off SVG foreignobject because it does not 
+        repaint/dirty correctly
+
+        * platform/mac/svg/custom/baseval-animval-equality-expected.checksum: Replaced.
+        * platform/mac/svg/custom/baseval-animval-equality-expected.png: Replaced.
+        * platform/mac/svg/custom/baseval-animval-equality-expected.txt: Replaced.
+        * platform/mac/svg/custom/dominant-baseline-hanging-expected.checksum: Replaced.
+        * platform/mac/svg/custom/dominant-baseline-hanging-expected.png: Replaced.
+        * platform/mac/svg/custom/dominant-baseline-hanging-expected.txt: Replaced.
+        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.checksum: Replaced.
+        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.png: Replaced.
+        * platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt: Replaced.
+        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.checksum: Replaced.
+        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.png: Replaced.
+        * platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt: Replaced.
+        * platform/mac/svg/custom/foreign-object-skew-expected.checksum: Replaced.
+        * platform/mac/svg/custom/foreign-object-skew-expected.png: Replaced.
+        * platform/mac/svg/custom/foreign-object-skew-expected.txt: Replaced.
+        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.checksum: Replaced.
+        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.png: Replaced.
+        * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt: Replaced.
+        * platform/mac/svg/custom/getPresentationAttribute-expected.checksum: Replaced.
+        * platform/mac/svg/custom/getPresentationAttribute-expected.png: Replaced.
+        * platform/mac/svg/custom/getPresentationAttribute-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt: Replaced.
+        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.checksum: Replaced.
+        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.png: Replaced.
+        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt: Replaced.
+        * platform/mac/svg/hixie/mixed/006-expected.checksum: Replaced.
+        * platform/mac/svg/hixie/mixed/006-expected.png: Replaced.
+        * platform/mac/svg/hixie/mixed/006-expected.txt: Replaced.
+        * platform/mac/svg/hixie/mixed/007-expected.checksum: Replaced.
+        * platform/mac/svg/hixie/mixed/007-expected.png: Replaced.
+        * platform/mac/svg/hixie/mixed/007-expected.txt: Replaced.
+        * platform/mac/svg/hixie/mixed/008-expected.checksum: Replaced.
+        * platform/mac/svg/hixie/mixed/008-expected.png: Replaced.
+        * platform/mac/svg/hixie/mixed/008-expected.txt: Replaced.
+        * platform/mac/svg/hixie/mixed/009-expected.checksum: Replaced.
+        * platform/mac/svg/hixie/mixed/009-expected.png: Replaced.
+        * platform/mac/svg/hixie/mixed/009-expected.txt: Replaced.
+        * platform/mac/svg/hixie/mixed/011-expected.checksum: Replaced.
+        * platform/mac/svg/hixie/mixed/011-expected.png: Replaced.
+        * platform/mac/svg/hixie/mixed/011-expected.txt: Replaced.
+
 2008-01-18  Adam Roben  <aroben@apple.com>
 
         Reviewed by Adele.
index 5f2ebbb9ce725b83427d5b1dd64db385c8aaaa88..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-6fd0e543d1b80f99591f55dd5e7f44df
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 8dec028e7605a08591c85d5a4bfcefcf4523772e..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.png and b/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.png differ
index 21ad7e1225876d00919e0deeabc6259fc8534922..710bbe55fe9a08750b4c2ba3ed7017a4de8ce2ec 100644 (file)
@@ -2,39 +2,3 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 600x400
   RenderSVGRoot {svg} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 800x198
-      RenderBlock {html} at (0,0) size 800x198
-        RenderBlock {div} at (0,0) size 800x198
-          RenderBlock (anonymous) at (0,0) size 800x18
-            RenderText {#text} at (0,0) size 560x18
-              text run at (0,0) width 560: "This tests to make sure that baseVal and animVal are tied when animation is not enabled:"
-          RenderBlock {div} at (0,18) size 800x18
-            RenderText {#text} at (0,0) size 152x18
-              text run at (0,0) width 152: "svg.x.baseVal.value = 0"
-          RenderBlock {div} at (0,36) size 800x18
-            RenderText {#text} at (0,0) size 155x18
-              text run at (0,0) width 155: "svg.x.animVal.value = 0"
-          RenderBlock {div} at (0,54) size 800x18
-            RenderText {#text} at (0,0) size 205x18
-              text run at (0,0) width 205: "setting svg.x.baseVal.value = 10"
-          RenderBlock {div} at (0,72) size 800x18
-            RenderText {#text} at (0,0) size 160x18
-              text run at (0,0) width 160: "svg.x.baseVal.value = 10"
-          RenderBlock {div} at (0,90) size 800x18
-            RenderText {#text} at (0,0) size 163x18
-              text run at (0,0) width 163: "svg.x.animVal.value = 10"
-          RenderBlock {div} at (0,108) size 800x18
-            RenderText {#text} at (0,0) size 122x18
-              text run at (0,0) width 122: "SUCCESS (1 of 2)"
-          RenderBlock {div} at (0,126) size 800x18
-            RenderText {#text} at (0,0) size 200x18
-              text run at (0,0) width 200: "setting svg.x.animVal.value = 5"
-          RenderBlock {div} at (0,144) size 800x18
-            RenderText {#text} at (0,0) size 152x18
-              text run at (0,0) width 152: "svg.x.baseVal.value = 5"
-          RenderBlock {div} at (0,162) size 800x18
-            RenderText {#text} at (0,0) size 155x18
-              text run at (0,0) width 155: "svg.x.animVal.value = 5"
-          RenderBlock {div} at (0,180) size 800x18
-            RenderText {#text} at (0,0) size 122x18
-              text run at (0,0) width 122: "SUCCESS (2 of 2)"
index be789b69dc0d6d1197235ad78382552e5b4347f8..8e879774210b13796c58abb7acbf580acd181414 100644 (file)
@@ -1 +1 @@
-dc86b08a092500c45beb7ab62df85e13
\ No newline at end of file
+16166fd6c4cc5c3b0d8c90679f5191ae
\ No newline at end of file
index bf18b8a993c1e649813184fe358a1f9a798c1de6..3d35df9e72ba3fd8b9750afc05c76c405345d571 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png and b/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.png differ
index 91182bbf3fa4a5d242c7902c340a33d650a8af3a..787299d9a6c13258d7f7e2047b155b064dbb61a1 100644 (file)
@@ -24,42 +24,3 @@ layer at (0,0) size 400x400
       RenderSVGText {text} at (2,14) size 323x22 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-17) size 323x22
           chunk 1 text run 1 at (2.00,14.40) startOffset 0 endOffset 40 width 323.00: "This is hanging from the top-left corner"
-    RenderForeignObject {foreignObject} at (0,0) size 380x124
-      RenderBlock {html} at (0,0) size 380x124
-        RenderBody {body} at (8,0) size 364x124
-          RenderBlock {p} at (0,0) size 364x90
-            RenderText {#text} at (0,0) size 347x36
-              text run at (0,0) width 347: "The piece of text above should be aligned with the top-"
-              text run at (0,18) width 286: "left corner of the rectangle below it. Both the "
-            RenderInline {code} at (0,0) size 48x15
-              RenderText {#text} at (286,20) size 48x15
-                text run at (286,20) width 48: "<text>"
-            RenderText {#text} at (334,18) size 361x36
-              text run at (334,18) width 27: " and"
-              text run at (0,36) width 23: "the "
-            RenderInline {code} at (0,0) size 48x15
-              RenderText {#text} at (23,38) size 48x15
-                text run at (23,38) width 48: "<rect>"
-            RenderText {#text} at (71,36) size 272x18
-              text run at (71,36) width 272: " are located at the same coordinates and the"
-            RenderInline {code} at (0,0) size 48x15
-              RenderText {#text} at (0,56) size 48x15
-                text run at (0,56) width 48: "<text>"
-            RenderText {#text} at (48,54) size 111x18
-              text run at (48,54) width 111: " element uses the "
-            RenderInline {code} at (0,0) size 56x15
-              RenderText {#text} at (159,56) size 56x15
-                text run at (159,56) width 56: "hanging"
-            RenderText {#text} at (215,54) size 78x18
-              text run at (215,54) width 78: " value for its"
-            RenderInline {code} at (0,0) size 136x15
-              RenderText {#text} at (0,74) size 136x15
-                text run at (0,74) width 136: "dominant-baseline"
-            RenderText {#text} at (136,72) size 59x18
-              text run at (136,72) width 59: " attribute."
-          RenderBlock {p} at (0,106) size 364x18
-            RenderInline {a} at (0,0) size 91x18 [color=#800000]
-              RenderText {#text} at (0,0) size 91x18
-                text run at (0,0) width 91: "Antoine Quint"
-            RenderText {#text} at (91,0) size 89x18
-              text run at (91,0) width 89: ", January 27th"
index eacbfcb4e96c25f204bfc1b96f1ff1b04af4cf87..f9502f5db45deda9ca87d386314edb6fe7b13bc3 100644 (file)
@@ -1 +1 @@
-c8182d0873751c9487c4e15471f26000
\ No newline at end of file
+a819b06f1ef22a7bbe732a0e0a9428bc
\ No newline at end of file
index b862e93befb7e173a9e43c34c2de8d31c7c75d1f..3497f9b3aac297e89e4ca13df10a442f9ba1a54c 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.png and b/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.png differ
index 158b882b3ce059b44aac2a673edb428e32797112..dc8daa6ccb2fef57397411f363ce5fd38ab9f80d 100644 (file)
@@ -2,35 +2,6 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (193.08,231.97) size 216.37x216.37
-    RenderForeignObject {foreignObject} at (0,0) size 800x180
-      RenderBlock {html} at (0,0) size 800x180
-        RenderBlock {div} at (0,0) size 800x180
-          RenderBlock (anonymous) at (0,0) size 800x18
-            RenderText {#text} at (0,0) size 532x18
-              text run at (0,0) width 532: "This tests assures dynamic SVGDocument creation via DOMParser interface works."
-          RenderBlock {div} at (0,18) size 800x18
-            RenderText {#text} at (0,0) size 625x18
-              text run at (0,0) width 625: "DOMParser.parseFromString returned: [object SVGDocument] should be: [object SVGDocument]"
-          RenderBlock {div} at (0,36) size 800x18
-            RenderText {#text} at (0,0) size 610x18
-              text run at (0,0) width 610: "SVGDocument's rootElement: [object SVGSVGElement] should be: [object SVGSVGElement]"
-          RenderBlock {div} at (0,54) size 800x18
-            RenderText {#text} at (0,0) size 358x18
-              text run at (0,0) width 358: "SVGDocument's rootElement width: 400 should be: 400"
-          RenderBlock {div} at (0,72) size 800x18
-            RenderText {#text} at (0,0) size 361x18
-              text run at (0,0) width 361: "SVGDocument's rootElement height: 400 should be: 400"
-          RenderBlock {div} at (0,90) size 800x18
-            RenderText {#text} at (0,0) size 631x18
-              text run at (0,0) width 631: "SVGDocument's rootElement first child: [object SVGGElement] should be: [object SVGGElement]"
-          RenderBlock {div} at (0,108) size 800x54
-            RenderText {#text} at (0,0) size 796x54
-              text run at (0,0) width 752: "XMLSerializer.serializeToString returned: <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"400\" height=\"400\"><g"
-              text run at (0,18) width 796: "transform=\"translate(-50, -50)\"><path id=\"path\" onclick=\"mouseHandler(evt)\" fill=\"#FF0000\" stroke=\"#00C000\" d=\"M 250"
-              text run at (0,36) width 699: "130 C 185 130 150 80 150 80 S 115 25 50 25 m 0 105 c 65 0 100 -50 100 -50 s 35 -55 100 -55\"/></g></svg>"
-          RenderBlock {div} at (0,162) size 800x18
-            RenderText {#text} at (0,0) size 679x18
-              text run at (0,0) width 679: "Imported the SVGGElement into our document: [object SVGGElement] should be: [object SVGGElement]"
     RenderSVGContainer {g} at (193.08,231.97) size 216.37x216.37 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,250.00)}]
       RenderSVGContainer {g} at (193.08,231.97) size 216.37x216.37 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-50.00,-50.00)}]
         RenderPath {path} at (193.08,231.97) size 216.37x216.37 [stroke={[type=SOLID] [color=#00C000]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M250.00,130.00C185.00,130.00,150.00,80.00,150.00,80.00C150.00,80.00,115.00,25.00,50.00,25.00M50.00,130.00C115.00,130.00,150.00,80.00,150.00,80.00C150.00,80.00,185.00,25.00,250.00,25.00"]
index 1b9d17771adb19617ebf11a77d34cdacedf98d69..1cb829afe58e9c0f94d8f77e87a5e57f30ddee5f 100644 (file)
@@ -1 +1 @@
-7d2e56fb073939a01f3d4bce1ff16f44
\ No newline at end of file
+697a74a2cfa0f6fb4707ba3538c2eda4
\ No newline at end of file
index 5726a169e79bd5dc28bb75a6987658764cf05a45..b09f069115804130866c3f07173ff5d5c23354ef 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.png and b/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.png differ
index 427af485db86d6286c0fe7d615736a0d2389b696..2647e504d04521c86253e560aa3c79253446e4ed 100644 (file)
@@ -3,14 +3,4 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (10,50) size 100x100
     RenderSVGContainer {a} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 800x18
-      RenderBlock {html} at (0,0) size 800x18
-        RenderBlock {div} at (0,0) size 800x18
-          RenderText {#text} at (0,0) size 554x18
-            text run at (0,0) width 554: "This test tests that the type of the fill css attribute is correctly reported as SVGPaint. See "
-          RenderInline {a} at (0,0) size 71x18 [color=#0000EE]
-            RenderText {#text} at (554,0) size 71x18
-              text run at (554,0) width 71: "Bug 14064"
-          RenderText {#text} at (625,0) size 4x18
-            text run at (625,0) width 4: "."
     RenderPath {rect} at (10,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,50.00L110.00,50.00L110.00,150.00L10.00,150.00"]
index d0b3fba9830e0b7298610c09072e55c589627745..82f9634c845643910b5b080941db17a195cd58b4 100644 (file)
@@ -1 +1 @@
-7d26ec4143234610bfeb1016e80068d1
\ No newline at end of file
+78a0267efb87fa6a8a3e9199a135a7db
\ No newline at end of file
index 3d4ff87dbc19ba33fc75ce0b1e4cead01e73e024..a4f805e0bd5fefccfb93c9a81c206cf598bbb913 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png and b/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png differ
index 0184291f65243f7d0ac3cf32823aecd21e863f73..8bf3904da5b9b7d1bea452e2ad8b7331d638a185 100644 (file)
@@ -2,15 +2,4 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (9.50,9.50) size 581x381
-    RenderForeignObject {foreignObject} at (0,0) size 580x380
-      RenderBlock {xhtml:div} at (0,0) size 580x18
-        RenderText {#text} at (0,0) size 78x18
-          text run at (0,0) width 78: "This is a test"
-      RenderBlock (anonymous) at (0,18) size 580x41
-        RenderInline {xhtml:a} at (0,0) size 66x18 [color=#0000EE]
-          RenderText {#text} at (0,0) size 66x18
-            text run at (0,0) width 66: "and a link."
-        RenderBR {xhtml:br} at (66,0) size 0x18
-        RenderButton {xhtml:input} at (2,21) size 16x18 [bgcolor=#C0C0C0]
-        RenderSVGInlineText {#text} at (0,0) size 0x0
     RenderPath {rect} at (9.50,9.50) size 581x381 [stroke={[type=SOLID] [color=#008000]}] [data="M10.00,10.00L590.00,10.00L590.00,390.00L10.00,390.00"]
index 2d50ab4b38fa7057536500b59774e63d9e3b5401..dc04307640445fe458c6ec0d994c8b4eb3b83ad7 100644 (file)
@@ -1 +1 @@
-a28645475c28c185278a9b1bb375a688
\ No newline at end of file
+1a7382b8faad6815e29fdc61b1fe022b
\ No newline at end of file
index a9b866d23330248cc3082b34849d06bf07768e00..04f96136ec4c5475b6ee7fd87c89de1c2738a636 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.png and b/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.png differ
index d1d7d6a2e02a8118a128d999a5f428e44d2c7e44..93fd27fc961f993d0860558597b4b0c0efe3397c 100644 (file)
@@ -4,11 +4,4 @@ layer at (0,0) size 800x800
   RenderSVGRoot {svg} at (49.50,49.50) size 301x301
     RenderSVGContainer {g} at (49.50,49.50) size 301x301 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
       RenderPath {polygon} at (49.50,49.50) size 301x301 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#ADD8E6]}] [data="M0.00,0.00L300.00,0.00L300.00,300.00L0.00,300.00"]
-      RenderForeignObject {foreignObject} at (0,0) size 280x280
-        RenderInline {html:b} at (0,0) size 108x18
-          RenderText {#text} at (0,0) size 108x18
-            text run at (0,0) width 108: "Absolute Lineto"
-        RenderBR {html:br} at (108,0) size 0x18
-        RenderSVGInlineText {#text} at (0,18) size 246x36
       RenderPath {path} at (99.19,129.50) size 201.62x201.62 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M50.00,80.00L250.00,80.00L150.00,280.00"]
-caret: position 7 of child 3 {#text} of child 5 {foreignObject} of child 1 {g} of child 0 {svg} of document
index 090dba4a5a30640c1161784e5d69ce4182a887b5..1cb829afe58e9c0f94d8f77e87a5e57f30ddee5f 100644 (file)
@@ -1 +1 @@
-1fd9942f4a905c349c8a5fde3791c43b
\ No newline at end of file
+697a74a2cfa0f6fb4707ba3538c2eda4
\ No newline at end of file
index aac81f79ee70e8b52d4b4a9f0ab0bde78eea007f..b09f069115804130866c3f07173ff5d5c23354ef 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.png and b/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.png differ
index 5c504f310a007669f72e97efa5ff36129adddb15..2647e504d04521c86253e560aa3c79253446e4ed 100644 (file)
@@ -3,15 +3,4 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (10,50) size 100x100
     RenderSVGContainer {a} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 800x36
-      RenderBlock {html} at (0,0) size 800x36
-        RenderBlock {div} at (0,0) size 800x36
-          RenderText {#text} at (0,0) size 791x36
-            text run at (0,0) width 791: "This test tests that getPresentationAttribute succesfully returns SVG presentation attributes, but not ones that are defined in the"
-            text run at (0,18) width 380: "inline style and not non SVG css properties like border. See "
-          RenderInline {a} at (0,0) size 71x18 [color=#0000EE]
-            RenderText {#text} at (380,18) size 71x18
-              text run at (380,18) width 71: "Bug 13976"
-          RenderText {#text} at (451,18) size 4x18
-            text run at (451,18) width 4: "."
     RenderPath {rect} at (10,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,50.00L110.00,50.00L110.00,150.00L10.00,150.00"]
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.png differ
index 6497587fbaa1d646163105a8725a0759331cc1e8..a571300c0098af9e7c3c11d43071d5b857c01b9c 100644 (file)
@@ -2,9 +2,5 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 480x360
-      RenderBlock {xhtml:div} at (0,0) size 480x18
-        RenderText {#text} at (0,0) size 244x18
-          text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
       RenderSVGContainer {g} at (250,-35.86) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.png differ
index 4ca5ccf45d9fe50857c663376d22094676e80a97..b92a770b270183d381f07af298b891e71bd27f8e 100644 (file)
@@ -4,10 +4,6 @@ layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
     RenderSVGContainer {g} at (0,0) size 0x0
       RenderSVGContainer {g} at (0,0) size 0x0
-        RenderForeignObject {foreignObject} at (0,0) size 580x380
-          RenderBlock {xhtml:div} at (0,0) size 580x18
-            RenderText {#text} at (0,0) size 244x18
-              text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
       RenderSVGContainer {g} at (250,-35.86) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
         RenderSVGContainer {g} at (250,-35.86) size 0x0
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.png differ
index b7ddab27ffe24f3716329cd5831413eb96a0dc17..65578bec0e0cbd06e6c6e46513b2834a5c1f1f3d 100644 (file)
@@ -2,10 +2,6 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 580x380
-      RenderBlock {xhtml:div} at (0,0) size 580x18
-        RenderText {#text} at (0,0) size 244x18
-          text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
       RenderSVGContainer {g} at (250,-35.86) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.png differ
index 919de411c683910efcc1eba8775111b5ffedd826..1e707952ca4404c81d47de2ba68b722321d7ece1 100644 (file)
@@ -4,10 +4,6 @@ layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
     RenderSVGContainer {g} at (0,0) size 0x0
       RenderSVGContainer {g} at (0,0) size 0x0
-        RenderForeignObject {foreignObject} at (0,0) size 580x380
-          RenderBlock {xhtml:div} at (0,0) size 580x18
-            RenderText {#text} at (0,0) size 244x18
-              text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
       RenderSVGContainer {g} at (250,-35.86) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}]
         RenderSVGContainer {g} at (250,-35.86) size 0x0
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.png differ
index 3d4230a38376177c46366c0a8ccfc8130c29c034..22198e64cd8f6281f46f449fc330a286aaff695c 100644 (file)
@@ -3,10 +3,6 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 580x380
-      RenderBlock {xhtml:div} at (0,0) size 580x18
-        RenderText {#text} at (0,0) size 244x18
-          text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (0,0) size 0x0
       RenderSVGContainer {g} at (25,25) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(25.00,25.00)}]
         RenderSVGViewportContainer {svg} at (25,25) size 0x0
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.png differ
index 0bc48bfccd0ad541900a85ea1dd37986f6a76bd8..5d51b1832df5d68e6193d45f4e88a58ecdc4ab0f 100644 (file)
@@ -4,14 +4,6 @@ layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGViewportContainer {svg} at (0,0) size 0x0
-        RenderForeignObject {foreignObject} at (0,0) size 580x380
-          RenderBlock {xhtml:div} at (0,0) size 580x18
-            RenderText {#text} at (0,0) size 244x18
-              text run at (0,0) width 244: "You should only see this string ONCE"
-    RenderForeignObject {foreignObject} at (0,0) size 580x380
-      RenderBlock {xhtml:div} at (0,0) size 580x18
-        RenderText {#text} at (0,0) size 244x18
-          text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (0,0) size 0x0
       RenderSVGContainer {g} at (25,25) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(25.00,25.00)}]
         RenderSVGViewportContainer {svg} at (25,25) size 0x0
index 44b70171e2294d8a6111f324a6d9525f8193669d..f378a10048e33b9caf1bb342a0759d9654cfda1b 100644 (file)
@@ -1 +1 @@
-0f23a1fbd345da676e6bb2083c2a4af6
\ No newline at end of file
+c6fb4ae13b95ee9a9ebae63541cfd03b
\ No newline at end of file
index 63580ac5d36c1e7904be8b5d073ab2d723f2ce5b..c40a7a2959c4ebc2c377b6f83dbeeb15c8650a28 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.png differ
index 54e93c9f3a8f949f9216300213896ded38fe9ac4..3dbd4d588f74ba3034900842e43312d87dfc21d5 100644 (file)
@@ -4,7 +4,6 @@ layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (25,25) size 75x75
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGContainer {g} at (0,0) size 75x75
-        RenderForeignObject {foreignObject} at (0,0) size 580x380
         RenderImage {image} at (0,0) size 75x75
     RenderSVGContainer {use} at (25,25) size 75x75
       RenderSVGContainer {g} at (25,25) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(25.00,25.00)}]
index d37d2ab6ac41566af8e88b5275f8cd58eb3d2b50..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-610625b8dacbbc1f8465bf94f5be7a73
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 54e6001cacfed272b1b5c4c794745da9f6a20fea..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.png and b/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.png differ
index 5919608848baad09f7c65435060a9f22402d0242..8df8acad6fa065f0fd3abc33efad7cdc33a998a6 100644 (file)
@@ -2,8 +2,4 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 480x360
-      RenderBlock {xhtml:div} at (0,0) size 480x18
-        RenderText {#text} at (0,0) size 244x18
-          text run at (0,0) width 244: "You should only see this string ONCE"
     RenderSVGContainer {use} at (250,-50) size 0x0 [transform={m=((0.71,0.71)(-0.71,0.71)) t=(250.00,-50.00)}]
index 78f3a411c4433085f80b59c4050600778086517e..9d492534131a9ab86d6de70bf6ab271edf05c544 100644 (file)
@@ -1 +1 @@
-8a1f1a2aa3dc0eb60c6465e081dc3b28
\ No newline at end of file
+0221556dc28a17df16d51dd1b3b7298d
\ No newline at end of file
index 9a9b0c58753275af13c6d1c023881eb15ddee607..500d02684f7de30a11a8e51c10d51b0381501159 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png and b/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png differ
index 654fdd1ee2180d29c121bfad710f948e253f3a3b..6c40b2f075e4172aa6da9d6fce78dbbd3bebe1be 100644 (file)
@@ -9,10 +9,4 @@ layer at (0,0) size 800x420
       RenderBlock (anonymous) at (0,200) size 784x204
         RenderSVGRoot {svg} at (58,258) size 100x100
           RenderPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M150.00,100.00L149.90,103.14L149.61,106.27L149.11,109.37L148.43,112.43L147.55,115.45L146.49,118.41L145.24,121.29L143.82,124.09L142.22,126.79L140.45,129.39L138.53,131.87L136.45,134.23L134.23,136.45L131.87,138.53L129.39,140.45L126.79,142.22L124.09,143.82L121.29,145.24L118.41,146.49L115.45,147.55L112.43,148.43L109.37,149.11L106.27,149.61L103.14,149.90L100.00,150.00L96.86,149.90L93.73,149.61L90.63,149.11L87.57,148.43L84.55,147.55L81.59,146.49L78.71,145.24L75.91,143.82L73.21,142.22L70.61,140.45L68.13,138.53L65.77,136.45L63.55,134.23L61.47,131.87L59.55,129.39L57.78,126.79L56.18,124.09L54.76,121.29L53.51,118.41L52.45,115.45L51.57,112.43L50.89,109.37L50.39,106.27L50.10,103.14L50.00,100.00L50.10,96.86L50.39,93.73L50.89,90.63L51.57,87.57L52.45,84.55L53.51,81.59L54.76,78.71L56.18,75.91L57.78,73.21L59.55,70.61L61.47,68.13L63.55,65.77L65.77,63.55L68.13,61.47L70.61,59.55L73.21,57.78L75.91,56.18L78.71,54.76L81.59,53.51L84.55,52.45L87.57,51.57L90.63,50.89L93.73,50.39L96.86,50.10L100.00,50.00L103.14,50.10L106.27,50.39L109.37,50.89L112.43,51.57L115.45,52.45L118.41,53.51L121.29,54.76L124.09,56.18L126.79,57.78L129.39,59.55L131.87,61.47L134.23,63.55L136.45,65.77L138.53,68.13L140.45,70.61L142.22,73.21L143.82,75.91L145.24,78.71L146.49,81.59L147.55,84.55L148.43,87.57L149.11,90.63L149.61,93.73L149.90,96.86"]
-          RenderForeignObject {foreignObject} at (0,0) size 200x200
         RenderText {#text} at (0,0) size 0x0
-layer at (8,8) size 200x200
-  RenderBlock (positioned) {div} at (8,8) size 200x200 [bgcolor=#FFFFFF]
-    RenderText {#text} at (0,0) size 199x36
-      text run at (0,0) width 190: "There should be a green circle"
-      text run at (0,18) width 199: "below with no red on this page."
index 6ca115fa223e56c653c96dfa758da50f950c735d..d69a371bd164f06577de22a549cab84c4e72938c 100644 (file)
@@ -1 +1 @@
-772a50aee1549a562b3afbe5d33714d2
\ No newline at end of file
+853de00567d121bea0b7bece66a5d61c
\ No newline at end of file
index 734e21c6c6daf88c03c626ec71acfb48c3b8b3e5..113fea49283c2cad5bcdb79a1e5f8d7c4fd56de7 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.png and b/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.png differ
index fb2d75802fcd47c4a3802b5f3a88cca8fcf5cae7..f1ad680db50e90ea0bfc2d046e2f8cbc68fe00f1 100644 (file)
@@ -2,7 +2,3 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 400x400
   RenderSVGRoot {svg} at (0,0) size 0x0
-    RenderForeignObject {foreignObject} at (0,0) size 400x400
-      RenderBlock {p} at (0,0) size 400x18
-        RenderText {#text} at (0,0) size 39x18
-          text run at (0,0) width 39: "PASS"
index d3dce182ee2b7499e0256d1ca19d366c6022bca4..6294ab4c3bad265da88b49d106109872e6d3a1be 100644 (file)
@@ -1 +1 @@
-da9c1c9912758a24d2afc4c83b411c47
\ No newline at end of file
+5ece9b987ac06296694c51166883080c
\ No newline at end of file
index 7acb550d2ff14b53b9852751dae34e7c2fe028e5..1148cafc9b222160514f31bbec7227ef7647785e 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png and b/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png differ
index 71913201e3763767e900f56b448d628cb4ec61f5..9b42f7437bcc29e436ff1a1ddcdd783d37f78875 100644 (file)
@@ -10,8 +10,4 @@ layer at (0,0) size 800x462
         RenderSVGRoot {svg} at (8,50) size 400x400
           RenderPath {rect} at (8,50) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00L400.00,0.00L400.00,400.00L0.00,400.00"]
           RenderPath {circle} at (8,50) size 400x400 [fill={[type=SOLID] [color=#000080]}] [data="M400.00,200.00L399.61,212.56L398.42,225.07L396.46,237.48L393.72,249.74L390.21,261.80L385.96,273.62L380.97,285.16L375.26,296.35L368.87,307.17L361.80,317.56L354.10,327.48L345.79,336.91L336.91,345.79L327.48,354.10L317.56,361.80L307.17,368.87L296.35,375.26L285.16,380.97L273.62,385.96L261.80,390.21L249.74,393.72L237.48,396.46L225.07,398.42L212.56,399.61L200.00,400.00L187.44,399.61L174.93,398.42L162.52,396.46L150.26,393.72L138.20,390.21L126.38,385.96L114.84,380.97L103.65,375.26L92.83,368.87L82.44,361.80L72.52,354.10L63.09,345.79L54.21,336.91L45.90,327.48L38.20,317.56L31.13,307.17L24.74,296.35L19.03,285.16L14.04,273.62L9.79,261.80L6.28,249.74L3.54,237.48L1.58,225.07L0.39,212.56L0.00,200.00L0.39,187.44L1.58,174.93L3.54,162.52L6.28,150.26L9.79,138.20L14.04,126.38L19.03,114.84L24.74,103.65L31.13,92.83L38.20,82.44L45.90,72.52L54.21,63.09L63.09,54.21L72.52,45.90L82.44,38.20L92.83,31.13L103.65,24.74L114.84,19.03L126.38,14.04L138.20,9.79L150.26,6.28L162.52,3.54L174.93,1.58L187.44,0.39L200.00,0.00L212.56,0.39L225.07,1.58L237.48,3.54L249.74,6.28L261.80,9.79L273.62,14.04L285.16,19.03L296.35,24.74L307.17,31.13L317.56,38.20L327.48,45.90L336.91,54.21L345.79,63.09L354.10,72.52L361.80,82.44L368.87,92.83L375.26,103.65L380.97,114.84L385.96,126.38L390.21,138.20L393.72,150.26L396.46,162.52L398.42,174.93L399.61,187.44"]
-          RenderForeignObject {foreignObject} at (0,0) size 400x50 [color=#FFFFFF]
-            RenderBlock {div} at (0,0) size 400x59
-              RenderText {#text} at (139,0) size 121x59
-                text run at (139,0) width 121: "TEST"
         RenderText {#text} at (0,0) size 0x0
index a6e7b8c64bb4c1f3811c65b71b5da1dd54446680..01eea3befe718893001861e96cd6652a4529c61f 100644 (file)
@@ -1 +1 @@
-f4060853b9684b97edbf2b1026414250
\ No newline at end of file
+15e2d1fd6057e9bf9a02fe222f733688
\ No newline at end of file
index e56f26f988f0ea16251420e9236fdac99860faf4..ece3790f5efac8c1143fe224d2f6dd7263c399e1 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.png and b/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.png differ
index 077b31ec0979c4b3e6b37e75821b795321c73b4c..ea4cf92ea75021576d1cecf97bfe8715af1f68c4 100644 (file)
@@ -9,10 +9,6 @@ layer at (0,0) size 800x302
       RenderBlock (anonymous) at (0,28) size 784x124
         RenderSVGRoot {svg} at (8,38) size 600x120
           RenderPath {rect} at (8,38) size 600x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M0.00,0.00L60.00,0.00L60.00,12.00L0.00,12.00"]
-          RenderForeignObject {foreignObject} at (0,0) size 60x10
-            RenderBlock {div} at (0,0) size 60x13 [color=#000080]
-              RenderText {#text} at (0,0) size 24x13
-                text run at (0,0) width 24: "TEST"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {div} at (0,162) size 400x120 [color=#000080] [bgcolor=#EEEEEE]
         RenderText {#text} at (0,0) size 239x115
index 78f3a411c4433085f80b59c4050600778086517e..9d492534131a9ab86d6de70bf6ab271edf05c544 100644 (file)
@@ -1 +1 @@
-8a1f1a2aa3dc0eb60c6465e081dc3b28
\ No newline at end of file
+0221556dc28a17df16d51dd1b3b7298d
\ No newline at end of file
index 9a9b0c58753275af13c6d1c023881eb15ddee607..500d02684f7de30a11a8e51c10d51b0381501159 100644 (file)
Binary files a/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png and b/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png differ
index 654fdd1ee2180d29c121bfad710f948e253f3a3b..6c40b2f075e4172aa6da9d6fce78dbbd3bebe1be 100644 (file)
@@ -9,10 +9,4 @@ layer at (0,0) size 800x420
       RenderBlock (anonymous) at (0,200) size 784x204
         RenderSVGRoot {svg} at (58,258) size 100x100
           RenderPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M150.00,100.00L149.90,103.14L149.61,106.27L149.11,109.37L148.43,112.43L147.55,115.45L146.49,118.41L145.24,121.29L143.82,124.09L142.22,126.79L140.45,129.39L138.53,131.87L136.45,134.23L134.23,136.45L131.87,138.53L129.39,140.45L126.79,142.22L124.09,143.82L121.29,145.24L118.41,146.49L115.45,147.55L112.43,148.43L109.37,149.11L106.27,149.61L103.14,149.90L100.00,150.00L96.86,149.90L93.73,149.61L90.63,149.11L87.57,148.43L84.55,147.55L81.59,146.49L78.71,145.24L75.91,143.82L73.21,142.22L70.61,140.45L68.13,138.53L65.77,136.45L63.55,134.23L61.47,131.87L59.55,129.39L57.78,126.79L56.18,124.09L54.76,121.29L53.51,118.41L52.45,115.45L51.57,112.43L50.89,109.37L50.39,106.27L50.10,103.14L50.00,100.00L50.10,96.86L50.39,93.73L50.89,90.63L51.57,87.57L52.45,84.55L53.51,81.59L54.76,78.71L56.18,75.91L57.78,73.21L59.55,70.61L61.47,68.13L63.55,65.77L65.77,63.55L68.13,61.47L70.61,59.55L73.21,57.78L75.91,56.18L78.71,54.76L81.59,53.51L84.55,52.45L87.57,51.57L90.63,50.89L93.73,50.39L96.86,50.10L100.00,50.00L103.14,50.10L106.27,50.39L109.37,50.89L112.43,51.57L115.45,52.45L118.41,53.51L121.29,54.76L124.09,56.18L126.79,57.78L129.39,59.55L131.87,61.47L134.23,63.55L136.45,65.77L138.53,68.13L140.45,70.61L142.22,73.21L143.82,75.91L145.24,78.71L146.49,81.59L147.55,84.55L148.43,87.57L149.11,90.63L149.61,93.73L149.90,96.86"]
-          RenderForeignObject {foreignObject} at (0,0) size 200x200
         RenderText {#text} at (0,0) size 0x0
-layer at (8,8) size 200x200
-  RenderBlock (positioned) {div} at (8,8) size 200x200 [bgcolor=#FFFFFF]
-    RenderText {#text} at (0,0) size 199x36
-      text run at (0,0) width 190: "There should be a green circle"
-      text run at (0,18) width 199: "below with no red on this page."
index 4d4faee3ee8b5ec67f8d74fa8060484997d43f96..d30ef5b3c7cfc8f21496c8775c15168afd0b2f33 100644 (file)
@@ -1,3 +1,27 @@
+2008-01-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Oliver.
+
+        Disables SVG foreign object for <rdar://problem/5686989> turn off 
+        SVG foreignobject because it does not repaint/dirty correctly
+
+        * DerivedSources.make:
+        * WebCore.SVG.ForeignObject.exp: Added.
+        * WebCore.SVG.exp:
+        * bindings/js/JSSVGElementWrapperFactory.cpp:
+        (WebCore::createJSSVGWrapper):
+        * rendering/RenderForeignObject.cpp:
+        * rendering/RenderForeignObject.h:
+        * svg/SVGForeignObjectElement.cpp:
+        * svg/SVGForeignObjectElement.h:
+        * svg/SVGForeignObjectElement.idl:
+        * svg/SVGLocatable.cpp:
+        (WebCore::SVGLocatable::nearestViewportElement):
+        (WebCore::SVGLocatable::farthestViewportElement):
+        * svg/SVGUseElement.cpp:
+        (WebCore::isDisallowedElement):
+        * svg/svgtags.in:
+
 2008-01-18  Mark Rowe  <mrowe@apple.com>
 
         Rubber-stamped by Adam Roben.
index f0d64a065f0f5ded5d10149c0d2c7ee2af8423dd..f4057225dc6b38f86c4e7ff0d05f14428815a3b3 100644 (file)
@@ -732,6 +732,11 @@ ifeq ($(findstring ENABLE_SVG_ANIMATION,$(FEATURE_DEFINES)), ENABLE_SVG_ANIMATIO
     WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.Animation.exp
 endif
 
+ifeq ($(findstring ENABLE_SVG_FOREIGN_OBJECT,$(FEATURE_DEFINES)), ENABLE_SVG_FOREIGN_OBJECT)
+       SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FOREIGN_OBJECT=1
+       WEBCORE_EXPORT_DEPENDENCIES := $(WEBCORE_EXPORT_DEPENDENCIES) WebCore.SVG.ForeignObject.exp
+endif
+
 # SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)
 ifdef SVG_FLAGS
 SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in
diff --git a/WebCore/WebCore.SVG.ForeignObject.exp b/WebCore/WebCore.SVG.ForeignObject.exp
new file mode 100644 (file)
index 0000000..255f600
--- /dev/null
@@ -0,0 +1 @@
+.objc_class_name_DOMSVGForeignObjectElement
index c1e6d95025981f55e1b4f39aec5e170961fb7646..6cf820b3fc31e53490f1972d02578da637d9b821 100644 (file)
@@ -25,7 +25,6 @@
 .objc_class_name_DOMSVGElementInstance
 .objc_class_name_DOMSVGElementInstanceList
 .objc_class_name_DOMSVGEllipseElement
-.objc_class_name_DOMSVGForeignObjectElement
 .objc_class_name_DOMSVGGElement
 .objc_class_name_DOMSVGGradientElement
 .objc_class_name_DOMSVGImageElement
index c1163897eb8bb2ce2bfd3af7f41e6268db3442b9..29ead3d0d109938fe8af1ca0e8f63e92dc4d6cac 100644 (file)
@@ -235,6 +235,14 @@ typedef JSNode* (*CreateSVGElementWrapperFunction)(ExecState*, PassRefPtr<SVGEle
 #define FOR_EACH_FILTER_TAG(macro)
 #endif
 
+#if ENABLE(SVG_FOREIGN_OBJECT)
+#define FOR_EACH_FOREIGN_OBJECT_TAG(macro) \
+    macro(foreignObject, ForeignObject) \
+    // end of macro
+#else
+#define FOR_EACH_FOREIGN_OBJECT_TAG(macro)
+#endif
+
 #define FOR_EACH_TAG(macro) \
     macro(a, A) \
     macro(circle, Circle) \
@@ -243,7 +251,6 @@ typedef JSNode* (*CreateSVGElementWrapperFunction)(ExecState*, PassRefPtr<SVGEle
     macro(defs, Defs) \
     macro(desc, Desc) \
     macro(ellipse, Ellipse) \
-    macro(foreignObject, ForeignObject) \
     macro(g, G) \
     macro(image, Image) \
     macro(linearGradient, LinearGradient) \
@@ -282,6 +289,7 @@ FOR_EACH_TAG(CREATE_WRAPPER_FUNCTION)
 FOR_EACH_ANIMATION_TAG(CREATE_WRAPPER_FUNCTION)
 FOR_EACH_FONT_TAG(CREATE_WRAPPER_FUNCTION)
 FOR_EACH_FILTER_TAG(CREATE_WRAPPER_FUNCTION)
+FOR_EACH_FOREIGN_OBJECT_TAG(CREATE_WRAPPER_FUNCTION)
 
 #undef CREATE_WRAPPER_FUNCTION
 
@@ -294,6 +302,7 @@ FOR_EACH_TAG(ADD_TO_HASH_MAP)
 FOR_EACH_ANIMATION_TAG(ADD_TO_HASH_MAP)
 FOR_EACH_FONT_TAG(ADD_TO_HASH_MAP)
 FOR_EACH_FILTER_TAG(ADD_TO_HASH_MAP)
+FOR_EACH_FOREIGN_OBJECT_TAG(ADD_TO_HASH_MAP)
 #undef ADD_TO_HASH_MAP
     }
     CreateSVGElementWrapperFunction createWrapperFunction = map.get(element->localName().impl());
index b9d65d96fb2f2c09209a5936bc99054fa1722603..8f90e7438996ebdfde1ff6ee8a830af6b35a3dc2 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#if ENABLE(SVG)
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 #include "RenderForeignObject.h"
 
 #include "GraphicsContext.h"
@@ -129,4 +129,4 @@ bool RenderForeignObject::nodeAtPoint(const HitTestRequest& request, HitTestResu
 
 } // namespace WebCore
 
-#endif // ENABLE(SVG)
+#endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
index a50434b6e423727092456a10444e9adf7fafce6a..b624683b345226bee6d93270a546d448876e8ba3 100644 (file)
@@ -22,7 +22,7 @@
 
 #ifndef RenderForeignObject_h
 #define RenderForeignObject_h
-#if ENABLE(SVG)
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 
 #include "AffineTransform.h"
 #include "RenderSVGBlock.h"
@@ -57,5 +57,5 @@ public:
 
 } // namespace WebCore
 
-#endif // ENABLE(SVG)
+#endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 #endif // RenderForeignObject_h
index c9ff6354be2d1ac94f74e502178b6affd2e8be60..1987a3321a8de639878ca5681c7e821ad8d9753b 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#if ENABLE(SVG)
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 #include "SVGForeignObjectElement.h"
 
 #include "CSSPropertyNames.h"
@@ -91,6 +91,6 @@ bool SVGForeignObjectElement::childShouldCreateRenderer(Node* child) const
 
 } // namespace WebCore
 
-#endif // ENABLE(SVG)
+#endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 
 // vim:ts=4:noet
index 133c7b399b49a96d8bfb255884eb2a496b0e8843..c0d4c041cbb55b58e362768d05832fce2ccfa70f 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef SVGForeignObjectElement_h
 #define SVGForeignObjectElement_h
 
-#if ENABLE(SVG)
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 
 #include "SVGTests.h"
 #include "SVGLangSpace.h"
@@ -66,7 +66,7 @@ namespace WebCore
 
 } // namespace WebCore
 
-#endif // ENABLE(SVG)
+#endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
 #endif
 
 // vim:ts=4:noet
index 2f1af2c5f9727568e1326c819c2523f7f63c9e16..918b7cc971295e9abdbee93949567547573cb4d3 100644 (file)
@@ -25,7 +25,7 @@
 
 module svg {
 
-    interface [Conditional=SVG] SVGForeignObjectElement : SVGElement,
+    interface [Conditional=SVG&&SVG_FOREIGN_OBJECT] SVGForeignObjectElement : SVGElement,
                                                           SVGTests,
                                                           SVGLangSpace,
                                                           SVGExternalResourcesRequired,
index 6ca9162d200134be3d59e1c90bd1a95fcbb1d971..91564a55a1525dc4ca4d55729fa0651c976c9724 100644 (file)
@@ -45,8 +45,12 @@ SVGElement* SVGLocatable::nearestViewportElement(const SVGStyledElement* e)
     Node* n = e->parentNode();
     while (n && !n->isDocumentNode()) {
         if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::symbolTag) ||
-            n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::foreignObjectTag))
+            n->hasTagName(SVGNames::imageTag))
             return static_cast<SVGElement*>(n);
+#if ENABLE(SVG_FOREIGN_OBJECT)
+        if (n->hasTagName(SVGNames::foreignObjectTag))
+            return static_cast<SVGElement*>(n);
+#endif
 
         n = n->parentNode();
     }
@@ -64,8 +68,12 @@ SVGElement* SVGLocatable::farthestViewportElement(const SVGStyledElement* e)
     Node* n = e->parentNode();
     while (n && !n->isDocumentNode()) {
         if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::symbolTag) ||
-            n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::foreignObjectTag))
+            n->hasTagName(SVGNames::imageTag))
+            farthest = static_cast<SVGElement*>(n);
+#if ENABLE(SVG_FOREIGN_OBJECT)
+        if (n->hasTagName(SVGNames::foreignObjectTag))
             farthest = static_cast<SVGElement*>(n);
+#endif
 
         n = n->parentNode();
     }
index 192571e24c8c037a4228509fe65f5239be035d1f..ae8fb747682b43d5681760f587222b1f4b0813ab 100644 (file)
@@ -225,9 +225,11 @@ void dumpInstanceTree(unsigned int& depth, String& text, SVGElementInstance* tar
 
 static bool isDisallowedElement(Node* element)
 {
+#if ENABLE(SVG_FOREIGN_OBJECT)
     // <foreignObject> should never be contained in a <use> tree. Too dangerous side effects possible.
     if (element->hasTagName(SVGNames::foreignObjectTag))
         return true;
+#endif
 
     return false;
 }
index d267d53be465d14ecb169d50f5696e56328b0d00..a21cef3375d3e223c4b03322cc861c2023b75530 100644 (file)
@@ -61,7 +61,9 @@ font_face_name
 font_face_src
 font_face_uri
 #endif
+#ifdef ENABLE_SVG_FOREIGN_OBJECT
 foreignObject
+#endif
 g
 #ifdef ENABLE_SVG_FONTS
 glyph
index 75c3c38c959da727010419b3adc949216091f295..7f64fc86d0721a5e06769ace3a1472462eb84857 100644 (file)
@@ -1,3 +1,12 @@
+2008-01-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Oliver.
+
+        Update build-webkit to account for foreign-object being disabled by 
+        default.
+
+        * Scripts/build-webkit:
+
 2008-01-18  Adam Roben  <aroben@apple.com>
 
         Updated for method renames
index 3b6f9b3896541b5bfd92f83bd5ba1749a69b722b..81b19566eacae0b86f2f4d94ae012f6ddaf3d333 100755 (executable)
@@ -43,6 +43,7 @@ my $svgSupport = 1;
 my $svgExperimentalSupport = 0;
 my $svgAnimationSupport = $svgExperimentalSupport;
 my $svgFiltersSupport = $svgExperimentalSupport;
+my $svgForeignObjectSupport = $svgForeignObjectSupport;
 my $svgUseSupport = 1;
 my $svgFontsSupport = 1;
 my $svgAsImageSupport = 1;
@@ -62,6 +63,7 @@ Usage: $programName [options] [options to pass to build system]
                                 implies SVG Support)
   --[no-]svg-animation          Toggle SVG animation support (default: $svgAnimationSupport, implies SVG Support)
   --[no-]svg-filters            Toggle SVG filters support (default: $svgFiltersSupport, implies SVG Support)
+  --[no-]svg-foreign-object     Toggle SVG forgeing object support (default: $svgForeignObjectSupport, implies SVG Support)
   --[no-]svg-fonts              Toggle SVG fonts support (default: $svgFontsSupport, implies SVG Support)
   --[no-]svg-as-image           Toggle SVG as Image support (default: $svgAsImageSupport, implies SVG Support)
   --[no-]svg-use                Toggle SVG use element support (default: $svgUseSupport, implies SVG Support)
@@ -75,6 +77,7 @@ GetOptions('svg!' => \$svgSupport,
            'svg-experimental!' => \$svgExperimentalSupport,
            'svg-animation!' => \$svgAnimationSupport,
            'svg-filters!' => \$svgFiltersSupport,
+           'svg-foreign-object!' => \$svgForeignObjectSupport,
            'svg-fonts!' => \$svgFontsSupport,
            'svg-as-image!' => \$svgAsImageSupport,
            'svg-use!' => \$svgUseSupport,
@@ -93,6 +96,7 @@ if ($showHelp) {
 $svgExperimentalSupport = 0 unless $svgSupport;
 $svgAnimationSupport = 0 unless $svgSupport;
 $svgFiltersSupport = 0 unless $svgSupport;
+$svgForeignObjectSupport = 0 unless $svgSupport;
 $svgFontsSupport = 0 unless $svgSupport;
 $svgAsImageSupport = 0 unless $svgSupport;
 $svgUseSupport = 0 unless $svgSupport;
@@ -100,6 +104,7 @@ $svgUseSupport = 0 unless $svgSupport;
 if ($svgExperimentalSupport) {
     $svgAnimationSupport = 1;
     $svgFiltersSupport = 1;
+    $svgForeignObjectSupport = 1;
     $svgFontsSupport = 1;
     $svgAsImageSupport = 1;
     $svgUseSupport = 1;
@@ -140,6 +145,7 @@ push @overrideFeatureDefinesOption, "ENABLE_ICONDATABASE";
 push @overrideFeatureDefinesOption, "ENABLE_SVG" if $svgSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_ANIMATION" if $svgAnimationSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_FILTERS" if $svgFiltersSupport;
+push @overrifeFeatureDefinesOption, "ENABLE_SVG_FOREIGN_OBJECT" if $svgForeignObjectSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_FONTS" if $svgFontsSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_AS_IMAGE" if $svgAsImageSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG_USE" if $svgUseSupport;
@@ -262,11 +268,12 @@ if ($svgSupport) {
     print "\n NOTE: WebKit has been built with SVG support enabled.\n";
     print " $launcherName will have SVG viewing capabilities.\n";
 }
-if ($svgAnimationSupport or $svgFiltersSupport or $svgFontsSupport or $svgAsImageSupport or $svgUseSupport) {
+if ($svgAnimationSupport or $svgFiltersSupport or $svgForeignObjectSupport or $svgFontsSupport or $svgAsImageSupport or $svgUseSupport) {
     print "\n NOTE: WebKit has been built with experimental SVG features enabled.\n";
     print " Your build supports: \n";
     print "  * Basic SVG animation.\n" if $svgAnimationSupport;
     print "  * SVG filters.\n" if $svgFiltersSupport;
+    print "  * SVG foreign object.\n" if $svgForeignObjectSupport;
     print "  * SVG fonts.\n" if $svgFontsSupport;
     print "  * SVG as image.\n" if $svgAsImageSupport;
     print "  * SVG <use> support.\n" if $svgUseSupport;