[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
krit at webkit.org
krit at webkit.org
Fri Jan 21 15:12:54 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit daf7d4da4eb0613bda977d64b7b940b0991ea7fa
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 9 17:05:28 2011 +0000
2011-01-09 Dirk Schulze <krit at webkit.org>
Reviewed by Nikolas Zimmermann.
Rename RenderForeignObject to RenderSVGForeignObject
https://bugs.webkit.org/show_bug.cgi?id=52129
Rename RenderForeignObject to RenderSVGForeignObject to match the naming schema in render/svg.
No change of functionality, no new tests.
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderingAllInOne.cpp:
* rendering/svg/RenderForeignObject.cpp: Removed.
* rendering/svg/RenderForeignObject.h: Removed.
* rendering/svg/RenderSVGAllInOne.cpp:
* rendering/svg/RenderSVGBlock.cpp:
(WebCore::RenderSVGBlock::updateBoxModelInfoFromStyle):
* rendering/svg/RenderSVGForeignObject.cpp: Copied from Source/WebCore/rendering/svg/RenderForeignObject.cpp.
(WebCore::RenderSVGForeignObject::RenderSVGForeignObject):
(WebCore::RenderSVGForeignObject::~RenderSVGForeignObject):
(WebCore::RenderSVGForeignObject::paint):
(WebCore::RenderSVGForeignObject::clippedOverflowRectForRepaint):
(WebCore::RenderSVGForeignObject::computeRectForRepaint):
(WebCore::RenderSVGForeignObject::localToParentTransform):
(WebCore::RenderSVGForeignObject::computeLogicalWidth):
(WebCore::RenderSVGForeignObject::computeLogicalHeight):
(WebCore::RenderSVGForeignObject::layout):
(WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
(WebCore::RenderSVGForeignObject::nodeAtPoint):
(WebCore::RenderSVGForeignObject::mapLocalToContainer):
* rendering/svg/RenderSVGForeignObject.h: Copied from Source/WebCore/rendering/svg/RenderForeignObject.h.
(WebCore::RenderSVGForeignObject::renderName):
* svg/SVGForeignObjectElement.cpp:
(WebCore::SVGForeignObjectElement::createRenderer):
2011-01-09 Dirk Schulze <krit at webkit.org>
Reviewed by Nikolas Zimmermann.
Rename RenderForeignObject to RenderSVGForeignObject
https://bugs.webkit.org/show_bug.cgi?id=52129
Renamed RenderForeignObject to RenderSVGForeignObject
* platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt:
* platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt:
* platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt:
* platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt:
* platform/chromium-win/svg/custom/foreign-object-skew-expected.txt:
* platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
* platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
* platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
* platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
* platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt:
* platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt:
* platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt:
* platform/chromium-win/svg/hixie/mixed/006-expected.txt:
* platform/chromium-win/svg/hixie/mixed/007-expected.txt:
* platform/chromium-win/svg/hixie/mixed/008-expected.txt:
* platform/chromium-win/svg/hixie/mixed/009-expected.txt:
* platform/chromium-win/svg/hixie/mixed/011-expected.txt:
* platform/chromium-win/svg/text/foreignObject-repaint-expected.txt:
* platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt:
* platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
* platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
* platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt:
* platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
* platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
* platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
* platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt:
* platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt:
* platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt:
* platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt:
* platform/gtk/svg/text/foreignObject-repaint-expected.txt:
* platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt:
* platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
* platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
* platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt:
* platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
* platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/mac/svg/custom/baseval-animval-equality-expected.txt:
* platform/mac/svg/custom/dominant-baseline-hanging-expected.txt:
* platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt:
* platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt:
* platform/mac/svg/custom/foreign-object-skew-expected.txt:
* platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt:
* platform/mac/svg/custom/getPresentationAttribute-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
* platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
* platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
* platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
* platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
* platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
* platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt:
* platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt:
* platform/mac/svg/foreignObject/text-tref-02-b-expected.txt:
* platform/mac/svg/hixie/mixed/006-expected.txt:
* platform/mac/svg/hixie/mixed/007-expected.txt:
* platform/mac/svg/hixie/mixed/008-expected.txt:
* platform/mac/svg/hixie/mixed/009-expected.txt:
* platform/mac/svg/hixie/mixed/011-expected.txt:
* platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt:
* platform/mac/svg/text/foreignObject-repaint-expected.txt:
* platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt:
* platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
* platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
* platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt:
* platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
* platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
* platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
* platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
* platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt:
* platform/qt/svg/foreignObject/text-tref-02-b-expected.txt:
* platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt:
* platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt:
* platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
* platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
* platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt:
* platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
* platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 164f062..ee7d5a5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,105 @@
+2011-01-09 Dirk Schulze <krit at webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
+ Rename RenderForeignObject to RenderSVGForeignObject
+ https://bugs.webkit.org/show_bug.cgi?id=52129
+
+ Renamed RenderForeignObject to RenderSVGForeignObject
+
+ * platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt:
+ * platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt:
+ * platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt:
+ * platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt:
+ * platform/chromium-win/svg/custom/foreign-object-skew-expected.txt:
+ * platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
+ * platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
+ * platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
+ * platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt:
+ * platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt:
+ * platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt:
+ * platform/chromium-win/svg/hixie/mixed/006-expected.txt:
+ * platform/chromium-win/svg/hixie/mixed/007-expected.txt:
+ * platform/chromium-win/svg/hixie/mixed/008-expected.txt:
+ * platform/chromium-win/svg/hixie/mixed/009-expected.txt:
+ * platform/chromium-win/svg/hixie/mixed/011-expected.txt:
+ * platform/chromium-win/svg/text/foreignObject-repaint-expected.txt:
+ * platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt:
+ * platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt:
+ * platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
+ * platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
+ * platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt:
+ * platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+ * platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
+ * platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
+ * platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt:
+ * platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt:
+ * platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt:
+ * platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt:
+ * platform/gtk/svg/text/foreignObject-repaint-expected.txt:
+ * platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt:
+ * platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt:
+ * platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
+ * platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
+ * platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt:
+ * platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
+ * platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/mac/svg/custom/baseval-animval-equality-expected.txt:
+ * platform/mac/svg/custom/dominant-baseline-hanging-expected.txt:
+ * platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt:
+ * platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt:
+ * platform/mac/svg/custom/foreign-object-skew-expected.txt:
+ * platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt:
+ * platform/mac/svg/custom/getPresentationAttribute-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
+ * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
+ * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
+ * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
+ * platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
+ * platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
+ * platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt:
+ * platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt:
+ * platform/mac/svg/foreignObject/text-tref-02-b-expected.txt:
+ * platform/mac/svg/hixie/mixed/006-expected.txt:
+ * platform/mac/svg/hixie/mixed/007-expected.txt:
+ * platform/mac/svg/hixie/mixed/008-expected.txt:
+ * platform/mac/svg/hixie/mixed/009-expected.txt:
+ * platform/mac/svg/hixie/mixed/011-expected.txt:
+ * platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt:
+ * platform/mac/svg/text/foreignObject-repaint-expected.txt:
+ * platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt:
+ * platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt:
+ * platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
+ * platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
+ * platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt:
+ * platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+ * platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt:
+ * platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
+ * platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
+ * platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt:
+ * platform/qt/svg/foreignObject/text-tref-02-b-expected.txt:
+ * platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt:
+ * platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt:
+ * platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt:
+ * platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt:
+ * platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt:
+ * platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt:
+
2011-01-08 Helder Correia <helder at sencha.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt b/LayoutTests/platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt
index 5387d82..0e9af44 100644
--- a/LayoutTests/platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt
+++ b/LayoutTests/platform/chromium-linux/svg/custom/dominant-baseline-hanging-expected.txt
@@ -21,7 +21,7 @@ layer at (0,0) size 400x400
RenderSVGText {text} at (2,-4) size 308x23 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 308x23
chunk 1 text run 1 at (2.00,13.60) startOffset 0 endOffset 40 width 308.00: "This is hanging from the top-left corner"
- RenderForeignObject {foreignObject} at (10,45) size 380x150
+ RenderSVGForeignObject {foreignObject} at (10,45) size 380x150
RenderBlock {html} at (0,0) size 380x136
RenderBody {body} at (8,0) size 364x136
RenderBlock {p} at (0,0) size 364x100
diff --git a/LayoutTests/platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt
index 2648d14..bc62438 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/baseval-animval-equality-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 600x400
RenderSVGRoot {svg} at (0,0) size 600x400
- RenderForeignObject {foreignObject} at (0,0) size 600x400
+ RenderSVGForeignObject {foreignObject} at (0,0) size 600x400
RenderBlock {html} at (0,0) size 600x240
RenderBlock {div} at (0,0) size 600x240
RenderBlock (anonymous) at (0,0) size 600x20
diff --git a/LayoutTests/platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt
index 5387d82..0e9af44 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/dominant-baseline-hanging-expected.txt
@@ -21,7 +21,7 @@ layer at (0,0) size 400x400
RenderSVGText {text} at (2,-4) size 308x23 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 308x23
chunk 1 text run 1 at (2.00,13.60) startOffset 0 endOffset 40 width 308.00: "This is hanging from the top-left corner"
- RenderForeignObject {foreignObject} at (10,45) size 380x150
+ RenderSVGForeignObject {foreignObject} at (10,45) size 380x150
RenderBlock {html} at (0,0) size 380x136
RenderBody {body} at (8,0) size 364x136
RenderBlock {p} at (0,0) size 364x100
diff --git a/LayoutTests/platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt
index 4bbc75e..6549c4e 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/dynamic-svg-document-creation-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
- RenderForeignObject {foreignObject} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
RenderBlock {html} at (0,0) size 800x200
RenderBlock {div} at (0,0) size 800x200
RenderBlock (anonymous) at (0,0) size 800x20
diff --git a/LayoutTests/platform/chromium-win/svg/custom/foreign-object-skew-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/foreign-object-skew-expected.txt
index 99210c1..4056200 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/foreign-object-skew-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/foreign-object-skew-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 74x19
text run at (0,0) width 74: "This is a test"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt
index 8f8e5f5..a74ca5d 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/foreignObject-crash-on-hover-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (49,49) size 302x302
RenderSVGContainer {g} at (49,49) size 302x302 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
RenderSVGPath {polygon} at (49,49) size 302x302 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#ADD8E6]}] [points="0 0 300 0 300 300 0 300"]
- RenderForeignObject {foreignObject} at (10,10) size 280x280
+ RenderSVGForeignObject {foreignObject} at (10,10) size 280x280
RenderInline {html:b} at (0,0) size 106x19
RenderText {#text} at (0,0) size 106x19
text run at (0,0) width 106: "Absolute Lineto"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
index bfd8c51..7604847 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 480x360
+ RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
RenderBlock {xhtml:div} at (0,0) size 480x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
index 92b7e1f..d49e9a7 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
index 795e5a6..768f598 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
index f32c35c..4876aab 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
index 46e7028..d1121b6 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
index 6d40e55..d0bf988 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
@@ -4,11 +4,11 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGViewportContainer {svg} at (86,87) size 714x513
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt b/LayoutTests/platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt
index bfd8c51..7604847 100644
--- a/LayoutTests/platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 480x360
+ RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
RenderBlock {xhtml:div} at (0,0) size 480x20
RenderText {#text} at (0,0) size 230x19
text run at (0,0) width 230: "You should only see this string ONCE"
diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
index 2041fd1..21bf58c 100644
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x20
RenderBlock {p} at (0,0) size 300x20
RenderText {#text} at (0,0) size 127x19
diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt
index f29b046..7fb5e0c 100644
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt
@@ -2,18 +2,18 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x400
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderSVGRoot {svg} at (0,5) size 32x19
RenderSVGContainer {g} at (0,5) size 32x19
RenderSVGText {text} at (0,5) size 32x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 32x19
chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 32.00: "crash"
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,50) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,50) size 300x100
RenderSVGRoot {svg} at (0,50) size 100x100
RenderSVGPath {rect} at (0,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,150) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,150) size 300x100
RenderSVGRoot {svg} at (0,150) size 100x100
RenderSVGPath {rect} at (0,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt
index da2bc17..da81720 100644
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x641
RenderBlock {p} at (0,0) size 300x20
RenderText {#text} at (0,0) size 206x19
diff --git a/LayoutTests/platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt b/LayoutTests/platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt
index c020fe5..a0daf05 100644
--- a/LayoutTests/platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/foreignObject/text-tref-02-b-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x600
RenderSVGInline {tref} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 0x0
+ RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderSVGRoot {svg} at (0,0) size 0x0
RenderSVGText {text} at (0,-17) size 41x21 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 41x21
diff --git a/LayoutTests/platform/chromium-win/svg/hixie/mixed/006-expected.txt b/LayoutTests/platform/chromium-win/svg/hixie/mixed/006-expected.txt
index b27a90d..a464c5c 100644
--- a/LayoutTests/platform/chromium-win/svg/hixie/mixed/006-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/hixie/mixed/006-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x421
RenderBlock (anonymous) at (0,200) size 784x205
RenderSVGRoot {svg} at (8,208) size 200x200
RenderSVGPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [cx=100.00] [cy=100.00] [r=50.00]
- RenderForeignObject {foreignObject} at (0,0) size 200x200
+ RenderSVGForeignObject {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]
diff --git a/LayoutTests/platform/chromium-win/svg/hixie/mixed/007-expected.txt b/LayoutTests/platform/chromium-win/svg/hixie/mixed/007-expected.txt
index ad74725..a6a751d 100644
--- a/LayoutTests/platform/chromium-win/svg/hixie/mixed/007-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/hixie/mixed/007-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 400x400
RenderSVGRoot {svg} at (0,0) size 400x400
- RenderForeignObject {foreignObject} at (0,0) size 400x400
+ RenderSVGForeignObject {foreignObject} at (0,0) size 400x400
RenderBlock {p} at (0,0) size 400x20
RenderText {#text} at (0,0) size 38x19
text run at (0,0) width 38: "PASS"
diff --git a/LayoutTests/platform/chromium-win/svg/hixie/mixed/008-expected.txt b/LayoutTests/platform/chromium-win/svg/hixie/mixed/008-expected.txt
index 6bd568b..2a403c9 100644
--- a/LayoutTests/platform/chromium-win/svg/hixie/mixed/008-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/hixie/mixed/008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x465
RenderSVGRoot {svg} at (8,52) size 400x400
RenderSVGPath {rect} at (8,52) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,52) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x59
RenderText {#text} at (139,1) size 121x57
text run at (139,1) width 121: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/hixie/mixed/009-expected.txt b/LayoutTests/platform/chromium-win/svg/hixie/mixed/009-expected.txt
index fca2c01..84e9707 100644
--- a/LayoutTests/platform/chromium-win/svg/hixie/mixed/009-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/hixie/mixed/009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x305
RenderBlock (anonymous) at (0,30) size 784x125
RenderSVGRoot {svg} at (8,40) size 400x120
RenderSVGPath {rect} at (8,40) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 26x12
text run at (0,0) width 26: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/hixie/mixed/011-expected.txt b/LayoutTests/platform/chromium-win/svg/hixie/mixed/011-expected.txt
index a0bdb98..abf55b5 100644
--- a/LayoutTests/platform/chromium-win/svg/hixie/mixed/011-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/hixie/mixed/011-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x421
RenderBlock (anonymous) at (0,200) size 784x205
RenderSVGRoot {svg} at (8,208) size 150x200
RenderSVGPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [cx=100.00] [cy=100.00] [r=50.00]
- RenderForeignObject {foreignObject} at (0,0) size 200x200
+ RenderSVGForeignObject {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]
diff --git a/LayoutTests/platform/chromium-win/svg/text/foreignObject-repaint-expected.txt b/LayoutTests/platform/chromium-win/svg/text/foreignObject-repaint-expected.txt
index 646c29c..6ef97c9 100644
--- a/LayoutTests/platform/chromium-win/svg/text/foreignObject-repaint-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/text/foreignObject-repaint-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (200,200) size 500x300
- RenderForeignObject {foreignObject} at (100,100) size 500x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 500x300
RenderBlock {div} at (0,0) size 500x186
RenderText {#text} at (0,1) size 481x184
text run at (0,1) width 481: "Select this text using"
diff --git a/LayoutTests/platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt b/LayoutTests/platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt
index 94305b1..3705ebe 100644
--- a/LayoutTests/platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/text/foreignObject-text-clipping-bug-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x295
RenderBlock (anonymous) at (0,30) size 784x125
RenderSVGRoot {svg} at (18,50) size 390x110
RenderSVGPath {rect} at (18,50) size 390x110 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=1.00] [y=1.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (1,1) size 60x10
+ RenderSVGForeignObject {foreignObject} at (1,1) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 26x12
text run at (0,0) width 26: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt
index 3a5016e..73e3783 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 1130x842
RenderView at (0,0) size 785x585
layer at (0,0) size 1130x842
RenderSVGRoot {svg} at (12,12) size 1118x830
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 74x19
text run at (0,0) width 74: "This is a test"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
index 6b90bd0..026d8ac 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 785x667
RenderSVGRoot {svg} at (11,73) size 576x576
RenderSVGPath {rect} at (11,73) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (11,73) size 576x576 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x59
RenderText {#text} at (139,1) size 121x57
text run at (139,1) width 121: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
index 464f154..ba460e6 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x434
RenderBlock (anonymous) at (0,41) size 778x179
RenderSVGRoot {svg} at (11,55) size 576x172
RenderSVGPath {rect} at (11,55) size 576x172 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 26x12
text run at (0,0) width 26: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt
index e529f42..e9df722 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x20
RenderText {#text} at (0,0) size 74x19
text run at (0,0) width 74: "This is a test"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index 80a23d0..590f586 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x488
RenderSVGRoot {svg} at (8,73) size 400x400
RenderSVGPath {rect} at (8,73) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,73) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x59
RenderText {#text} at (139,1) size 121x57
text run at (139,1) width 121: "TEST"
diff --git a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
index 11981d0..e9d7a91 100644
--- a/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x314
RenderBlock (anonymous) at (0,37) size 784x127
RenderSVGRoot {svg} at (8,47) size 400x120
RenderSVGPath {rect} at (8,47) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 26x12
text run at (0,0) width 26: "TEST"
diff --git a/LayoutTests/platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt b/LayoutTests/platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
index 4f6e344..0f9ab94 100644
--- a/LayoutTests/platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
+++ b/LayoutTests/platform/gtk/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
@@ -2,4 +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 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
diff --git a/LayoutTests/platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt b/LayoutTests/platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
index 1809630..09213ba 100644
--- a/LayoutTests/platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
+++ b/LayoutTests/platform/gtk/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x19
RenderBlock {p} at (0,0) size 300x19
RenderText {#text} at (0,0) size 135x19
diff --git a/LayoutTests/platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt b/LayoutTests/platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt
index 1746df8..4c9762f 100644
--- a/LayoutTests/platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt
+++ b/LayoutTests/platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt
@@ -2,18 +2,18 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x400
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderSVGRoot {svg} at (0,5) size 33x19
RenderSVGContainer {g} at (0,5) size 33x19
RenderSVGText {text} at (0,5) size 33x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 33x19
chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 33.00: "crash"
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,50) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,50) size 300x100
RenderSVGRoot {svg} at (0,50) size 100x100
RenderSVGPath {rect} at (0,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,150) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,150) size 300x100
RenderSVGRoot {svg} at (0,150) size 100x100
RenderSVGPath {rect} at (0,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt b/LayoutTests/platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt
index e8aab6f..94257b6 100644
--- a/LayoutTests/platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt
+++ b/LayoutTests/platform/gtk/svg/foreignObject/svg-document-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x639
RenderBlock {p} at (0,0) size 300x19
RenderText {#text} at (0,0) size 218x19
diff --git a/LayoutTests/platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt b/LayoutTests/platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt
index 363eafa..63792ce 100644
--- a/LayoutTests/platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt
+++ b/LayoutTests/platform/gtk/svg/foreignObject/text-tref-02-b-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x600
RenderSVGInline {tref} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 0x0
+ RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderSVGRoot {svg} at (0,0) size 0x0
RenderSVGText {text} at (0,-17) size 41x21 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 41x21
diff --git a/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt b/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt
index b2eff88..ea65a94 100644
--- a/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt
+++ b/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt
@@ -2,6 +2,6 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 500x500
RenderSVGRoot {svg} at (200,200) size 300x300
- RenderForeignObject {foreignObject} at (100,100) size 300x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
layer at (100,100) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
RenderBlock (positioned) {html:div} at (100,100) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/gtk/svg/text/foreignObject-repaint-expected.txt b/LayoutTests/platform/gtk/svg/text/foreignObject-repaint-expected.txt
index d50f5bb..088c432 100644
--- a/LayoutTests/platform/gtk/svg/text/foreignObject-repaint-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/foreignObject-repaint-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
- RenderForeignObject {foreignObject} at (100,100) size 500x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 500x300
RenderBlock {div} at (0,0) size 500x201
RenderText {#text} at (0,0) size 487x201
text run at (0,0) width 487: "Select this text using"
diff --git a/LayoutTests/platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt b/LayoutTests/platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt
index 8244922..57d7053 100644
--- a/LayoutTests/platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x293
RenderBlock (anonymous) at (0,29) size 784x124
RenderSVGRoot {svg} at (18,49) size 390x110
RenderSVGPath {rect} at (18,49) size 390x110 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=1.00] [y=1.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (1,1) size 60x10
+ RenderSVGForeignObject {foreignObject} at (1,1) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 24x12
text run at (0,0) width 24: "TEST"
diff --git a/LayoutTests/platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt b/LayoutTests/platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt
index 2f1b1fc..33a9dc6 100644
--- a/LayoutTests/platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/gtk/svg/zoom/page/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 1125x837
RenderView at (0,0) size 781x581
layer at (0,0) size 1125x837
RenderSVGRoot {svg} at (12,12) size 1113x825
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x19
RenderText {#text} at (0,0) size 78x19
text run at (0,0) width 78: "This is a test"
diff --git a/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
index 57d4674..2a67ae6 100644
--- a/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 781x664
RenderSVGRoot {svg} at (11,72) size 576x576
RenderSVGPath {rect} at (11,72) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (11,72) size 576x576 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x58
RenderText {#text} at (139,1) size 121x56
text run at (139,1) width 121: "TEST"
diff --git a/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
index 7a96949..a2147f4 100644
--- a/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/gtk/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x431
RenderBlock (anonymous) at (0,40) size 778x177
RenderSVGRoot {svg} at (11,54) size 576x172
RenderSVGPath {rect} at (11,54) size 576x172 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x12 [color=#000080]
RenderText {#text} at (0,0) size 24x12
text run at (0,0) width 24: "TEST"
diff --git a/LayoutTests/platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt b/LayoutTests/platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt
index 42f6751..0f9b665 100644
--- a/LayoutTests/platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/gtk/svg/zoom/text/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x19
RenderText {#text} at (0,0) size 78x19
text run at (0,0) width 78: "This is a test"
diff --git a/LayoutTests/platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index cc9201b..240e260 100644
--- a/LayoutTests/platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/gtk/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x485
RenderSVGRoot {svg} at (8,72) size 400x400
RenderSVGPath {rect} at (8,72) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,72) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x58
RenderText {#text} at (139,1) size 121x56
text run at (139,1) width 121: "TEST"
diff --git a/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
index 07a85cc..6f5c693 100644
--- a/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 785x665
RenderSVGRoot {svg} at (11,72) size 576x576
RenderSVGPath {rect} at (11,72) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (11,72) size 576x576 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) 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"
diff --git a/LayoutTests/platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index 22cc512..c0f43b8 100644
--- a/LayoutTests/platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/mac-leopard/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x486
RenderSVGRoot {svg} at (8,72) size 400x400
RenderSVGPath {rect} at (8,72) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,72) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.txt b/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.txt
index 414a729..da48428 100644
--- a/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/baseval-animval-equality-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 600x400
RenderSVGRoot {svg} at (0,0) size 600x400
- RenderForeignObject {foreignObject} at (0,0) size 600x400
+ RenderSVGForeignObject {foreignObject} at (0,0) size 600x400
RenderBlock {html} at (0,0) size 600x216
RenderBlock {div} at (0,0) size 600x216
RenderBlock (anonymous) at (0,0) size 600x18
diff --git a/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.txt b/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.txt
index eb8609d..b652d8b 100644
--- a/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/dominant-baseline-hanging-expected.txt
@@ -21,7 +21,7 @@ layer at (0,0) size 400x400
RenderSVGText {text} at (2,-4) size 323x24 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 323x24
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 (10,45) size 380x150
+ RenderSVGForeignObject {foreignObject} at (10,45) size 380x150
RenderBlock {html} at (0,0) size 380x124
RenderBody {body} at (8,0) size 364x124
RenderBlock {p} at (0,0) size 364x90
diff --git a/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt b/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt
index cbc6134..94d4777 100644
--- a/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/dynamic-svg-document-creation-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
- RenderForeignObject {foreignObject} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
RenderBlock {html} at (0,0) size 800x180
RenderBlock {div} at (0,0) size 800x180
RenderBlock (anonymous) at (0,0) size 800x18
diff --git a/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt b/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt
index 8680155..b94a024 100644
--- a/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/fill-SVGPaint-interface-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
RenderSVGContainer {a} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
RenderBlock {html} at (0,0) size 800x18
RenderBlock {div} at (0,0) size 800x18
RenderText {#text} at (0,0) size 554x18
diff --git a/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.txt b/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.txt
index 6393b1e..743e26f 100644
--- a/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt b/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt
index 55c2b5e..a9423e4 100644
--- a/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/foreignObject-crash-on-hover-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (49,49) size 302x302
RenderSVGContainer {g} at (49,49) size 302x302 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
RenderSVGPath {polygon} at (49,49) size 302x302 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#ADD8E6]}] [points="0 0 300 0 300 300 0 300"]
- RenderForeignObject {foreignObject} at (10,10) size 280x280
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.txt b/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.txt
index c95b026..a31f7d2 100644
--- a/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/getPresentationAttribute-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
RenderSVGContainer {a} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 800x600
+ RenderSVGForeignObject {foreignObject} at (0,0) size 800x600
RenderBlock {html} at (0,0) size 800x36
RenderBlock {div} at (0,0) size 800x36
RenderText {#text} at (0,0) size 791x36
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
index 0c1dd05..232be57 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 480x360
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
index efea865..32e8a87 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
index 155974f..fa2ab6a 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
index 57cbe27..450594d 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
RenderSVGContainer {g} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
index 1e3a896..74510de 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
index e4afb81..2af3ce7 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt
@@ -4,11 +4,11 @@ layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGViewportContainer {svg} at (86,87) size 714x513
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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 (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt
index 2a597ff..3f43d67 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt
@@ -4,7 +4,7 @@ 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 600x400
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderSVGImage {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)}]
diff --git a/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt b/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt
index 0c1dd05..232be57 100644
--- a/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (108,109) size 692x491
- RenderForeignObject {foreignObject} at (10,10) size 480x360
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt b/LayoutTests/platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
index 4f6e344..0f9ab94 100644
--- a/LayoutTests/platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
+++ b/LayoutTests/platform/mac/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
@@ -2,4 +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 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
diff --git a/LayoutTests/platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt b/LayoutTests/platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
index f900eac..85cc7c3 100644
--- a/LayoutTests/platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
+++ b/LayoutTests/platform/mac/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x18
RenderBlock {p} at (0,0) size 300x18
RenderText {#text} at (0,0) size 135x18
diff --git a/LayoutTests/platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt b/LayoutTests/platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt
index 5ea06ad..dc26061 100644
--- a/LayoutTests/platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt
+++ b/LayoutTests/platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt
@@ -2,18 +2,18 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x400
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderSVGRoot {svg} at (0,6) size 33x18
RenderSVGContainer {g} at (0,6) size 33x18
RenderSVGText {text} at (0,6) size 33x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 33x18
chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 33.00: "crash"
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,50) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,50) size 300x100
RenderSVGRoot {svg} at (0,50) size 100x100
RenderSVGPath {rect} at (0,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,150) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,150) size 300x100
RenderSVGRoot {svg} at (0,150) size 100x100
RenderSVGPath {rect} at (0,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt b/LayoutTests/platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt
index 06bbdc7..fc7288e 100644
--- a/LayoutTests/platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt
+++ b/LayoutTests/platform/mac/svg/foreignObject/svg-document-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x638
RenderBlock {p} at (0,0) size 300x18
RenderText {#text} at (0,0) size 218x18
diff --git a/LayoutTests/platform/mac/svg/foreignObject/text-tref-02-b-expected.txt b/LayoutTests/platform/mac/svg/foreignObject/text-tref-02-b-expected.txt
index 484f116..7e6f478 100644
--- a/LayoutTests/platform/mac/svg/foreignObject/text-tref-02-b-expected.txt
+++ b/LayoutTests/platform/mac/svg/foreignObject/text-tref-02-b-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x600
RenderSVGInline {tref} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 0x0
+ RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderSVGRoot {svg} at (0,0) size 0x0
RenderSVGText {text} at (0,-17) size 41x21 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 41x21
diff --git a/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.txt b/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.txt
index da5ae1d..75c3f39 100644
--- a/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.txt
+++ b/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x420
RenderBlock (anonymous) at (0,200) size 784x204
RenderSVGRoot {svg} at (8,208) size 200x200
RenderSVGPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [cx=100.00] [cy=100.00] [r=50.00]
- RenderForeignObject {foreignObject} at (0,0) size 200x200
+ RenderSVGForeignObject {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]
diff --git a/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.txt b/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.txt
index 63e39fc..6307282 100644
--- a/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.txt
+++ b/LayoutTests/platform/mac/svg/hixie/mixed/007-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 400x400
RenderSVGRoot {svg} at (0,0) size 400x400
- RenderForeignObject {foreignObject} at (0,0) size 400x400
+ RenderSVGForeignObject {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"
diff --git a/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.txt b/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.txt
index d89723f..b4dc73b 100644
--- a/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.txt
+++ b/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x462
RenderSVGRoot {svg} at (8,50) size 400x400
RenderSVGPath {rect} at (8,50) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,50) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) 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"
diff --git a/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.txt b/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.txt
index 7d60b71..f8d16de 100644
--- a/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.txt
+++ b/LayoutTests/platform/mac/svg/hixie/mixed/009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x302
RenderBlock (anonymous) at (0,28) size 784x124
RenderSVGRoot {svg} at (8,38) size 400x120
RenderSVGPath {rect} at (8,38) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {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"
diff --git a/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.txt b/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.txt
index 7654b0e..45e3e86 100644
--- a/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.txt
+++ b/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x420
RenderBlock (anonymous) at (0,200) size 784x204
RenderSVGRoot {svg} at (8,208) size 150x200
RenderSVGPath {circle} at (58,258) size 100x100 [fill={[type=SOLID] [color=#008000]}] [cx=100.00] [cy=100.00] [r=50.00]
- RenderForeignObject {foreignObject} at (0,0) size 200x200
+ RenderSVGForeignObject {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]
diff --git a/LayoutTests/platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt b/LayoutTests/platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt
index b2eff88..ea65a94 100644
--- a/LayoutTests/platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt
+++ b/LayoutTests/platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt
@@ -2,6 +2,6 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 500x500
RenderSVGRoot {svg} at (200,200) size 300x300
- RenderForeignObject {foreignObject} at (100,100) size 300x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
layer at (100,100) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
RenderBlock (positioned) {html:div} at (100,100) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/mac/svg/text/foreignObject-repaint-expected.txt b/LayoutTests/platform/mac/svg/text/foreignObject-repaint-expected.txt
index bd782ab..11c555a 100644
--- a/LayoutTests/platform/mac/svg/text/foreignObject-repaint-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/foreignObject-repaint-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (200,200) size 500x300
- RenderForeignObject {foreignObject} at (100,100) size 500x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 500x300
RenderBlock {div} at (0,0) size 500x183
RenderText {#text} at (0,0) size 487x183
text run at (0,0) width 487: "Select this text using"
diff --git a/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt b/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
index 6f037af..2892649 100644
--- a/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/foreignObject-text-clipping-bug-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x292
RenderBlock (anonymous) at (0,28) size 784x124
RenderSVGRoot {svg} at (18,48) size 390x110
RenderSVGPath {rect} at (18,48) size 390x110 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=1.00] [y=1.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (1,1) size 60x10
+ RenderSVGForeignObject {foreignObject} at (1,1) 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"
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt
index 62da1cf..37dee2f 100644
--- a/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 1130x842
RenderView at (0,0) size 785x585
layer at (0,0) size 1130x842
RenderSVGRoot {svg} at (12,12) size 1118x830
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
index 07a85cc..6f5c693 100644
--- a/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 785x665
RenderSVGRoot {svg} at (11,72) size 576x576
RenderSVGPath {rect} at (11,72) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (11,72) size 576x576 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) 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"
diff --git a/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
index 453c6fb..8698082 100644
--- a/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x432
RenderBlock (anonymous) at (0,40) size 778x178
RenderSVGRoot {svg} at (11,54) size 576x172
RenderSVGPath {rect} at (11,54) size 576x172 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {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"
diff --git a/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt b/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt
index c76a97d..0129962 100644
--- a/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/text/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) 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"
diff --git a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index 22cc512..c0f43b8 100644
--- a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x486
RenderSVGRoot {svg} at (8,72) size 400x400
RenderSVGPath {rect} at (8,72) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,72) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) 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"
diff --git a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
index a8373e4..c3c2bb1 100644
--- a/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x312
RenderBlock (anonymous) at (0,36) size 784x126
RenderSVGRoot {svg} at (8,46) size 400x120
RenderSVGPath {rect} at (8,46) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {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"
diff --git a/LayoutTests/platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
index 4f6e344..0f9ab94 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/disallowed-svg-nodes-as-direct-children-expected.txt
@@ -2,4 +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 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
diff --git a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
index b886aac..890be2c 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x21
RenderBlock {p} at (0,0) size 300x21
RenderText {#text} at (0,0) size 146x21
diff --git a/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
index d8d02d7..f355b57 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
@@ -2,18 +2,18 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x400
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderSVGRoot {svg} at (0,4) size 37x21
RenderSVGContainer {g} at (0,4) size 37x21
RenderSVGText {text} at (0,4) size 37x21 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 37x21
chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 37.00: "crash"
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,50) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,50) size 300x100
RenderSVGRoot {svg} at (0,50) size 100x100
RenderSVGPath {rect} at (0,50) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,150) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,150) size 300x100
RenderSVGRoot {svg} at (0,150) size 100x100
RenderSVGPath {rect} at (0,150) size 100x100 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
index 042169e..fbd4434 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
- RenderForeignObject {foreignObject} at (0,0) size 300x100
+ RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
RenderBlock {html} at (0,0) size 300x642
RenderBlock {p} at (0,0) size 300x21
RenderText {#text} at (0,0) size 233x21
diff --git a/LayoutTests/platform/qt/svg/foreignObject/text-tref-02-b-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/text-tref-02-b-expected.txt
index 007009a..9595d13 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/text-tref-02-b-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/text-tref-02-b-expected.txt
@@ -13,7 +13,7 @@ layer at (0,0) size 800x600
RenderSVGInline {tref} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderForeignObject {foreignObject} at (0,0) size 0x0
+ RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderSVGRoot {svg} at (0,0) size 0x0
RenderSVGText {text} at (0,-18) size 41x23 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 41x23
diff --git a/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt b/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt
index b2eff88..ea65a94 100644
--- a/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt
+++ b/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt
@@ -2,6 +2,6 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 500x500
RenderSVGRoot {svg} at (200,200) size 300x300
- RenderForeignObject {foreignObject} at (100,100) size 300x300
+ RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
layer at (100,100) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600
RenderBlock (positioned) {html:div} at (100,100) size 6006x6006 [bgcolor=#008000] [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt b/LayoutTests/platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt
index 7943d35..5f131f6 100644
--- a/LayoutTests/platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt
+++ b/LayoutTests/platform/qt/svg/text/foreignObject-text-clipping-bug-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x296
RenderBlock (anonymous) at (0,31) size 784x125
RenderSVGRoot {svg} at (18,51) size 390x110
RenderSVGPath {rect} at (18,51) size 390x110 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#D3D3D3]}] [x=1.00] [y=1.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (1,1) size 60x10
+ RenderSVGForeignObject {foreignObject} at (1,1) size 60x10
RenderBlock {div} at (0,0) size 60x13 [color=#000080]
RenderText {#text} at (0,0) size 27x13
text run at (0,0) width 27: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt
index 6a6f8a4..3ec12c2 100644
--- a/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 1129x841
RenderView at (0,0) size 784x584
layer at (0,0) size 1129x841
RenderSVGRoot {svg} at (12,12) size 1117x829
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x21
RenderText {#text} at (0,0) size 83x21
text run at (0,0) width 83: "This is a test"
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
index 32397e1..6a2b16b 100644
--- a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 784x670
RenderSVGRoot {svg} at (11,76) size 576x576
RenderSVGPath {rect} at (11,76) size 576x576 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (11,76) size 576x576 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x65
RenderText {#text} at (136,0) size 127x65
text run at (136,0) width 127: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
index 53d3057..fb5a7ce 100644
--- a/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/page/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x437
RenderBlock (anonymous) at (0,44) size 778x179
RenderSVGRoot {svg} at (11,58) size 576x172
RenderSVGPath {rect} at (11,58) size 576x172 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x13 [color=#000080]
RenderText {#text} at (0,0) size 27x13
text run at (0,0) width 27: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt
index d5ea666..bd82ad6 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-foreignObject-expected.txt
@@ -2,7 +2,7 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (9,9) size 791x591
- RenderForeignObject {foreignObject} at (10,10) size 580x380
+ RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
RenderBlock {xhtml:div} at (0,0) size 580x21
RenderText {#text} at (0,0) size 83x21
text run at (0,0) width 83: "This is a test"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
index 05a8c91..a6d55d9 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-008-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x491
RenderSVGRoot {svg} at (8,76) size 400x400
RenderSVGPath {rect} at (8,76) size 400x400 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
RenderSVGPath {circle} at (8,76) size 400x400 [fill={[type=SOLID] [color=#000080]}] [cx=200.00] [cy=200.00] [r=200.00]
- RenderForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
+ RenderSVGForeignObject {foreignObject} at (0,175) size 400x50 [color=#FFFFFF]
RenderBlock {div} at (0,0) size 400x65
RenderText {#text} at (136,0) size 127x65
text run at (136,0) width 127: "TEST"
diff --git a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
index 8ecad72..35144bb 100644
--- a/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
+++ b/LayoutTests/platform/qt/svg/zoom/text/zoom-hixie-mixed-009-expected.txt
@@ -9,7 +9,7 @@ layer at (0,0) size 800x317
RenderBlock (anonymous) at (0,40) size 784x127
RenderSVGRoot {svg} at (8,50) size 400x120
RenderSVGPath {rect} at (8,50) size 400x120 [transform={m=((10.00,0.00)(0.00,10.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#EEEEEE]}] [x=0.00] [y=0.00] [width=60.00] [height=12.00]
- RenderForeignObject {foreignObject} at (0,0) size 60x10
+ RenderSVGForeignObject {foreignObject} at (0,0) size 60x10
RenderBlock {div} at (0,0) size 60x13 [color=#000080]
RenderText {#text} at (0,0) size 27x13
text run at (0,0) width 27: "TEST"
diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk
index c000987..75fc876 100644
--- a/Source/WebCore/Android.mk
+++ b/Source/WebCore/Android.mk
@@ -695,9 +695,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
ifeq ($(ENABLE_SVG), true)
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
- rendering/svg/RenderForeignObject.cpp \
rendering/svg/RenderSVGBlock.cpp \
rendering/svg/RenderSVGContainer.cpp \
+ rendering/svg/RenderSVGForeignObject.cpp \
rendering/svg/RenderSVGGradientStop.cpp \
rendering/svg/RenderSVGHiddenContainer.cpp \
rendering/svg/RenderSVGImage.cpp \
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 76c3e18..294c459 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -1791,10 +1791,10 @@ IF (ENABLE_SVG)
rendering/PointerEventsHitRules.cpp
rendering/style/SVGRenderStyle.cpp
rendering/style/SVGRenderStyleDefs.cpp
- rendering/svg/RenderForeignObject.cpp
rendering/svg/RenderSVGBlock.cpp
rendering/svg/RenderSVGContainer.cpp
rendering/svg/RenderSVGGradientStop.cpp
+ rendering/svg/RenderSVGForeignObject.cpp
rendering/svg/RenderSVGHiddenContainer.cpp
rendering/svg/RenderSVGImage.cpp
rendering/svg/RenderSVGInline.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6e59503..5e5d7e5 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,47 @@
Reviewed by Nikolas Zimmermann.
+ Rename RenderForeignObject to RenderSVGForeignObject
+ https://bugs.webkit.org/show_bug.cgi?id=52129
+
+ Rename RenderForeignObject to RenderSVGForeignObject to match the naming schema in render/svg.
+
+ No change of functionality, no new tests.
+
+ * Android.mk:
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderingAllInOne.cpp:
+ * rendering/svg/RenderForeignObject.cpp: Removed.
+ * rendering/svg/RenderForeignObject.h: Removed.
+ * rendering/svg/RenderSVGAllInOne.cpp:
+ * rendering/svg/RenderSVGBlock.cpp:
+ (WebCore::RenderSVGBlock::updateBoxModelInfoFromStyle):
+ * rendering/svg/RenderSVGForeignObject.cpp: Copied from Source/WebCore/rendering/svg/RenderForeignObject.cpp.
+ (WebCore::RenderSVGForeignObject::RenderSVGForeignObject):
+ (WebCore::RenderSVGForeignObject::~RenderSVGForeignObject):
+ (WebCore::RenderSVGForeignObject::paint):
+ (WebCore::RenderSVGForeignObject::clippedOverflowRectForRepaint):
+ (WebCore::RenderSVGForeignObject::computeRectForRepaint):
+ (WebCore::RenderSVGForeignObject::localToParentTransform):
+ (WebCore::RenderSVGForeignObject::computeLogicalWidth):
+ (WebCore::RenderSVGForeignObject::computeLogicalHeight):
+ (WebCore::RenderSVGForeignObject::layout):
+ (WebCore::RenderSVGForeignObject::nodeAtFloatPoint):
+ (WebCore::RenderSVGForeignObject::nodeAtPoint):
+ (WebCore::RenderSVGForeignObject::mapLocalToContainer):
+ * rendering/svg/RenderSVGForeignObject.h: Copied from Source/WebCore/rendering/svg/RenderForeignObject.h.
+ (WebCore::RenderSVGForeignObject::renderName):
+ * svg/SVGForeignObjectElement.cpp:
+ (WebCore::SVGForeignObjectElement::createRenderer):
+
+2011-01-09 Dirk Schulze <krit at webkit.org>
+
+ Reviewed by Nikolas Zimmermann.
+
Move all SVG renderer to WebCore/rendering/svg
https://bugs.webkit.org/show_bug.cgi?id=52087
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 0b74ec4..45f5d51 100644
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -2918,12 +2918,12 @@ webcore_sources += \
Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp \
Source/WebCore/rendering/style/SVGRenderStyleDefs.h \
Source/WebCore/rendering/style/SVGRenderStyle.h \
- Source/WebCore/rendering/svg/RenderForeignObject.cpp \
- Source/WebCore/rendering/svg/RenderForeignObject.h \
Source/WebCore/rendering/svg/RenderSVGBlock.cpp \
Source/WebCore/rendering/svg/RenderSVGBlock.h \
Source/WebCore/rendering/svg/RenderSVGContainer.cpp \
Source/WebCore/rendering/svg/RenderSVGContainer.h \
+ Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp \
+ Source/WebCore/rendering/svg/RenderSVGForeignObject.h \
Source/WebCore/rendering/svg/RenderSVGGradientStop.cpp \
Source/WebCore/rendering/svg/RenderSVGGradientStop.h \
Source/WebCore/rendering/svg/RenderSVGHiddenContainer.cpp \
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 1cc87a3..e68d267 100644
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -3654,12 +3654,12 @@
'rendering/style/StyleTransformData.h',
'rendering/style/StyleVisualData.cpp',
'rendering/style/StyleVisualData.h',
- 'rendering/svg/RenderForeignObject.cpp',
- 'rendering/svg/RenderForeignObject.h',
'rendering/svg/RenderSVGBlock.cpp',
'rendering/svg/RenderSVGBlock.h',
'rendering/svg/RenderSVGContainer.cpp',
'rendering/svg/RenderSVGContainer.h',
+ 'rendering/svg/RenderSVGForeignObject.cpp',
+ 'rendering/svg/RenderSVGForeignObject.h',
'rendering/svg/RenderSVGGradientStop.cpp',
'rendering/svg/RenderSVGGradientStop.h',
'rendering/svg/RenderSVGHiddenContainer.cpp',
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index 5dd677c..0a75a7f 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -2348,9 +2348,9 @@ HEADERS += \
rendering/style/StyleVisualData.h \
rendering/style/SVGRenderStyleDefs.h \
rendering/style/SVGRenderStyle.h \
- rendering/svg/RenderForeignObject.h \
rendering/svg/RenderSVGBlock.h \
rendering/svg/RenderSVGContainer.h \
+ rendering/svg/RenderSVGForeignObject.h \
rendering/svg/RenderSVGGradientStop.h \
rendering/svg/RenderSVGHiddenContainer.h \
rendering/svg/RenderSVGImage.h \
@@ -3469,9 +3469,9 @@ contains(DEFINES, ENABLE_SVG=1) {
css/SVGCSSStyleSelector.cpp \
rendering/style/SVGRenderStyle.cpp \
rendering/style/SVGRenderStyleDefs.cpp \
- rendering/svg/RenderForeignObject.cpp \
rendering/svg/RenderSVGBlock.cpp \
rendering/svg/RenderSVGContainer.cpp \
+ rendering/svg/RenderSVGForeignObject.cpp \
rendering/svg/RenderSVGGradientStop.cpp \
rendering/svg/RenderSVGHiddenContainer.cpp \
rendering/svg/RenderSVGImage.cpp \
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 2235339..4c6ea13 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -939,8 +939,6 @@
41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */; settings = {ATTRIBUTES = (Private, ); }; };
41F1D2200EF35C2A00DA8753 /* ScriptCachedFrameData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */; };
41F584C7104652CB009CAA64 /* JSMessagePortCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */; };
- 436708BE12D9CA4B00044234 /* RenderForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4367087F12D9CA4A00044234 /* RenderForeignObject.cpp */; };
- 436708BF12D9CA4B00044234 /* RenderForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088012D9CA4A00044234 /* RenderForeignObject.h */; };
436708C012D9CA4B00044234 /* RenderSVGBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4367088112D9CA4A00044234 /* RenderSVGBlock.cpp */; };
436708C112D9CA4B00044234 /* RenderSVGBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = 4367088212D9CA4A00044234 /* RenderSVGBlock.h */; };
436708C212D9CA4B00044234 /* RenderSVGContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4367088312D9CA4A00044234 /* RenderSVGContainer.cpp */; };
@@ -1002,6 +1000,8 @@
436708FA12D9CA4B00044234 /* SVGResourcesCycleSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 436708BB12D9CA4B00044234 /* SVGResourcesCycleSolver.h */; };
436708FB12D9CA4B00044234 /* SVGShadowTreeElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 436708BC12D9CA4B00044234 /* SVGShadowTreeElements.cpp */; };
436708FC12D9CA4B00044234 /* SVGShadowTreeElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 436708BD12D9CA4B00044234 /* SVGShadowTreeElements.h */; };
+ 43C092BB12D9E4EE00A989C3 /* RenderSVGForeignObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43C092B912D9E4EE00A989C3 /* RenderSVGForeignObject.cpp */; };
+ 43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */; };
4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
4415292F0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */; };
441B055C0CD77A2D007C1F18 /* DOMHTMLEmbedElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 4429AAFB0CB84E88007647C5 /* DOMHTMLEmbedElementPrivate.h */; };
@@ -7268,8 +7268,6 @@
41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCachedFrameData.h; sourceTree = "<group>"; };
41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCachedFrameData.cpp; sourceTree = "<group>"; };
41F584C6104652CB009CAA64 /* JSMessagePortCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessagePortCustom.h; sourceTree = "<group>"; };
- 4367087F12D9CA4A00044234 /* RenderForeignObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderForeignObject.cpp; sourceTree = "<group>"; };
- 4367088012D9CA4A00044234 /* RenderForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderForeignObject.h; sourceTree = "<group>"; };
4367088112D9CA4A00044234 /* RenderSVGBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGBlock.cpp; sourceTree = "<group>"; };
4367088212D9CA4A00044234 /* RenderSVGBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGBlock.h; sourceTree = "<group>"; };
4367088312D9CA4A00044234 /* RenderSVGContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGContainer.cpp; sourceTree = "<group>"; };
@@ -7331,6 +7329,8 @@
436708BB12D9CA4B00044234 /* SVGResourcesCycleSolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGResourcesCycleSolver.h; sourceTree = "<group>"; };
436708BC12D9CA4B00044234 /* SVGShadowTreeElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGShadowTreeElements.cpp; sourceTree = "<group>"; };
436708BD12D9CA4B00044234 /* SVGShadowTreeElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGShadowTreeElements.h; sourceTree = "<group>"; };
+ 43C092B912D9E4EE00A989C3 /* RenderSVGForeignObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGForeignObject.cpp; sourceTree = "<group>"; };
+ 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGForeignObject.h; sourceTree = "<group>"; };
4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPlugInImageElement.h; sourceTree = "<group>"; };
4415292D0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPlugInImageElement.cpp; sourceTree = "<group>"; };
4429AAFB0CB84E88007647C5 /* DOMHTMLEmbedElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMHTMLEmbedElementPrivate.h; sourceTree = "<group>"; };
@@ -12392,12 +12392,12 @@
088C2F7412390080003D65CE /* svg */ = {
isa = PBXGroup;
children = (
- 4367087F12D9CA4A00044234 /* RenderForeignObject.cpp */,
- 4367088012D9CA4A00044234 /* RenderForeignObject.h */,
4367088112D9CA4A00044234 /* RenderSVGBlock.cpp */,
4367088212D9CA4A00044234 /* RenderSVGBlock.h */,
4367088312D9CA4A00044234 /* RenderSVGContainer.cpp */,
4367088412D9CA4A00044234 /* RenderSVGContainer.h */,
+ 43C092B912D9E4EE00A989C3 /* RenderSVGForeignObject.cpp */,
+ 43C092BA12D9E4EE00A989C3 /* RenderSVGForeignObject.h */,
4367088512D9CA4A00044234 /* RenderSVGGradientStop.cpp */,
4367088612D9CA4A00044234 /* RenderSVGGradientStop.h */,
4367088712D9CA4A00044234 /* RenderSVGHiddenContainer.cpp */,
@@ -21541,7 +21541,6 @@
A8EA73C40A1900E300A8EF5F /* RenderFieldset.h in Headers */,
066C77310AB603FD00238CC4 /* RenderFileUploadControl.h in Headers */,
BCEA486E097D93020094C9E4 /* RenderFlexibleBox.h in Headers */,
- 436708BF12D9CA4B00044234 /* RenderForeignObject.h in Headers */,
A871DED30A1530C700B12A68 /* RenderFrame.h in Headers */,
0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */,
A871DED10A1530C700B12A68 /* RenderFrameSet.h in Headers */,
@@ -21596,6 +21595,7 @@
D302754E12A5FEAB004BD828 /* RenderSummary.h in Headers */,
436708C112D9CA4B00044234 /* RenderSVGBlock.h in Headers */,
436708C312D9CA4B00044234 /* RenderSVGContainer.h in Headers */,
+ 43C092BC12D9E4EE00A989C3 /* RenderSVGForeignObject.h in Headers */,
436708C512D9CA4B00044234 /* RenderSVGGradientStop.h in Headers */,
436708C712D9CA4B00044234 /* RenderSVGHiddenContainer.h in Headers */,
436708C912D9CA4B00044234 /* RenderSVGImage.h in Headers */,
@@ -24330,7 +24330,6 @@
A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */,
066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */,
BCEA486D097D93020094C9E4 /* RenderFlexibleBox.cpp in Sources */,
- 436708BE12D9CA4B00044234 /* RenderForeignObject.cpp in Sources */,
A871DED40A1530C700B12A68 /* RenderFrame.cpp in Sources */,
0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
A871DED20A1530C700B12A68 /* RenderFrameSet.cpp in Sources */,
@@ -24382,6 +24381,7 @@
D302754D12A5FEAB004BD828 /* RenderSummary.cpp in Sources */,
436708C012D9CA4B00044234 /* RenderSVGBlock.cpp in Sources */,
436708C212D9CA4B00044234 /* RenderSVGContainer.cpp in Sources */,
+ 43C092BB12D9E4EE00A989C3 /* RenderSVGForeignObject.cpp in Sources */,
436708C412D9CA4B00044234 /* RenderSVGGradientStop.cpp in Sources */,
436708C612D9CA4B00044234 /* RenderSVGHiddenContainer.cpp in Sources */,
436708C812D9CA4B00044234 /* RenderSVGImage.cpp in Sources */,
diff --git a/Source/WebCore/rendering/RenderingAllInOne.cpp b/Source/WebCore/rendering/RenderingAllInOne.cpp
index 37ba704..faa3566 100644
--- a/Source/WebCore/rendering/RenderingAllInOne.cpp
+++ b/Source/WebCore/rendering/RenderingAllInOne.cpp
@@ -53,7 +53,6 @@
#include "RenderFieldset.cpp"
#include "RenderFileUploadControl.cpp"
#include "RenderFlexibleBox.cpp"
-#include "RenderForeignObject.cpp"
#include "RenderFrame.cpp"
#include "RenderFrameBase.cpp"
#include "RenderFrameSet.cpp"
diff --git a/Source/WebCore/rendering/svg/RenderForeignObject.cpp b/Source/WebCore/rendering/svg/RenderForeignObject.cpp
deleted file mode 100644
index 2331f55..0000000
--- a/Source/WebCore/rendering/svg/RenderForeignObject.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2009 Google, Inc.
- * Copyright (C) Research In Motion Limited 2010. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
-#include "RenderForeignObject.h"
-
-#include "GraphicsContext.h"
-#include "RenderSVGResource.h"
-#include "RenderView.h"
-#include "SVGForeignObjectElement.h"
-#include "SVGRenderSupport.h"
-#include "SVGSVGElement.h"
-#include "TransformState.h"
-
-namespace WebCore {
-
-RenderForeignObject::RenderForeignObject(SVGForeignObjectElement* node)
- : RenderSVGBlock(node)
- , m_needsTransformUpdate(true)
-{
-}
-
-RenderForeignObject::~RenderForeignObject()
-{
-}
-
-void RenderForeignObject::paint(PaintInfo& paintInfo, int, int)
-{
- if (paintInfo.context->paintingDisabled())
- return;
-
- PaintInfo childPaintInfo(paintInfo);
- childPaintInfo.context->save();
- childPaintInfo.applyTransform(localTransform());
-
- if (SVGRenderSupport::isOverflowHidden(this))
- childPaintInfo.context->clip(m_viewport);
-
- float opacity = style()->opacity();
- if (opacity < 1.0f)
- childPaintInfo.context->beginTransparencyLayer(opacity);
-
- RenderBlock::paint(childPaintInfo, 0, 0);
-
- if (opacity < 1.0f)
- childPaintInfo.context->endTransparencyLayer();
-
- childPaintInfo.context->restore();
-}
-
-IntRect RenderForeignObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer)
-{
- return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
-}
-
-void RenderForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed)
-{
- SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
-}
-
-const AffineTransform& RenderForeignObject::localToParentTransform() const
-{
- m_localToParentTransform = localTransform();
- m_localToParentTransform.translate(m_viewport.x(), m_viewport.y());
- return m_localToParentTransform;
-}
-
-void RenderForeignObject::computeLogicalWidth()
-{
- // FIXME: Investigate in size rounding issues
- setWidth(static_cast<int>(roundf(m_viewport.width())));
-}
-
-void RenderForeignObject::computeLogicalHeight()
-{
- // FIXME: Investigate in size rounding issues
- setHeight(static_cast<int>(roundf(m_viewport.height())));
-}
-
-void RenderForeignObject::layout()
-{
- ASSERT(needsLayout());
- ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState for the SVG rendering tree.
-
- LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement*>(node());
-
- bool updateCachedBoundariesInParents = false;
- if (m_needsTransformUpdate) {
- m_localTransform = foreign->animatedLocalTransform();
- m_needsTransformUpdate = false;
- updateCachedBoundariesInParents = true;
- }
-
- FloatRect oldViewport = m_viewport;
-
- // Cache viewport boundaries
- FloatPoint viewportLocation(foreign->x().value(foreign), foreign->y().value(foreign));
- m_viewport = FloatRect(viewportLocation, FloatSize(foreign->width().value(foreign), foreign->height().value(foreign)));
- if (!updateCachedBoundariesInParents)
- updateCachedBoundariesInParents = oldViewport != m_viewport;
-
- // Set box origin to the foreignObject x/y translation, so positioned objects in XHTML content get correct
- // positions. A regular RenderBoxModelObject would pull this information from RenderStyle - in SVG those
- // properties are ignored for non <svg> elements, so we mimic what happens when specifying them through CSS.
-
- // FIXME: Investigate in location rounding issues - only affects RenderForeignObject & RenderSVGText
- setLocation(roundedIntPoint(viewportLocation));
-
- bool layoutChanged = m_everHadLayout && selfNeedsLayout();
- RenderBlock::layout();
- ASSERT(!needsLayout());
-
- // If our bounds changed, notify the parents.
- if (updateCachedBoundariesInParents)
- RenderSVGBlock::setNeedsBoundariesUpdate();
-
- // Invalidate all resources of this client if our layout changed.
- if (layoutChanged)
- SVGResourcesCache::clientLayoutChanged(this);
-
- repainter.repaintAfterLayout();
-}
-
-bool RenderForeignObject::nodeAtFloatPoint(const HitTestRequest& request, HitTestResult& result, const FloatPoint& pointInParent, HitTestAction hitTestAction)
-{
- FloatPoint localPoint = localTransform().inverse().mapPoint(pointInParent);
-
- // Early exit if local point is not contained in clipped viewport area
- if (SVGRenderSupport::isOverflowHidden(this) && !m_viewport.contains(localPoint))
- return false;
-
- IntPoint roundedLocalPoint = roundedIntPoint(localPoint);
- return RenderBlock::nodeAtPoint(request, result, roundedLocalPoint.x(), roundedLocalPoint.y(), 0, 0, hitTestAction);
-}
-
-bool RenderForeignObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, int, int, int, int, HitTestAction)
-{
- ASSERT_NOT_REACHED();
- return false;
-}
-
-void RenderForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
-{
- // When crawling up the hierachy starting from foreignObject child content, useTransforms may not be set to true.
- if (!useTransforms)
- useTransforms = true;
- SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
-}
-
-}
-
-#endif
diff --git a/Source/WebCore/rendering/svg/RenderForeignObject.h b/Source/WebCore/rendering/svg/RenderForeignObject.h
deleted file mode 100644
index 8f4c235..0000000
--- a/Source/WebCore/rendering/svg/RenderForeignObject.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2009 Google, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef RenderForeignObject_h
-#define RenderForeignObject_h
-
-#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
-#include "AffineTransform.h"
-#include "FloatPoint.h"
-#include "RenderSVGBlock.h"
-
-namespace WebCore {
-
-class SVGForeignObjectElement;
-
-class RenderForeignObject : public RenderSVGBlock {
-public:
- explicit RenderForeignObject(SVGForeignObjectElement*);
- virtual ~RenderForeignObject();
-
- virtual const char* renderName() const { return "RenderForeignObject"; }
-
- virtual void paint(PaintInfo&, int parentX, int parentY);
-
- virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
- virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
-
- virtual bool requiresLayer() const { return false; }
- virtual void layout();
-
- virtual FloatRect objectBoundingBox() const { return m_viewport; }
- virtual FloatRect strokeBoundingBox() const { return m_viewport; }
- virtual FloatRect repaintRectInLocalCoordinates() const { return m_viewport; }
-
- virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
- virtual bool isSVGForeignObject() const { return true; }
-
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState&) const;
- virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
-
- private:
- virtual void computeLogicalWidth();
- virtual void computeLogicalHeight();
-
- virtual const AffineTransform& localToParentTransform() const;
- virtual AffineTransform localTransform() const { return m_localTransform; }
-
- bool m_needsTransformUpdate : 1;
- FloatRect m_viewport;
- AffineTransform m_localTransform;
- mutable AffineTransform m_localToParentTransform;
-};
-
-}
-
-#endif
-#endif
diff --git a/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp b/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp
index 3e564d7..835bce8 100644
--- a/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp
@@ -27,6 +27,7 @@
#include "RenderSVGBlock.cpp"
#include "RenderSVGContainer.cpp"
+#include "RenderSVGForeignObject.cpp"
#include "RenderSVGGradientStop.cpp"
#include "RenderSVGHiddenContainer.cpp"
#include "RenderSVGImage.cpp"
diff --git a/Source/WebCore/rendering/svg/RenderSVGBlock.cpp b/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
index 80cfee0..ed8e24e 100644
--- a/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGBlock.cpp
@@ -58,7 +58,7 @@ void RenderSVGBlock::updateBoxModelInfoFromStyle()
// Render(SVGText|ForeignObject) return 'false' on 'requiresLayer'. Fine for RenderSVGText.
//
// If we want to support overflow rules for <foreignObject> we can choose between two solutions:
- // a) make RenderForeignObject require layers and SVG layer aware
+ // a) make RenderSVGForeignObject require layers and SVG layer aware
// b) reactor overflow logic out of RenderLayer (as suggested by dhyatt), which is a large task
//
// Until this is resolved, disable overflow support. Opera/FF don't support it as well at the moment (Feb 2010).
diff --git a/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp b/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp
new file mode 100644
index 0000000..200fab2
--- /dev/null
+++ b/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2009 Google, Inc.
+ * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
+#include "RenderSVGForeignObject.h"
+
+#include "GraphicsContext.h"
+#include "RenderSVGResource.h"
+#include "RenderView.h"
+#include "SVGForeignObjectElement.h"
+#include "SVGRenderSupport.h"
+#include "SVGSVGElement.h"
+#include "TransformState.h"
+
+namespace WebCore {
+
+RenderSVGForeignObject::RenderSVGForeignObject(SVGForeignObjectElement* node)
+ : RenderSVGBlock(node)
+ , m_needsTransformUpdate(true)
+{
+}
+
+RenderSVGForeignObject::~RenderSVGForeignObject()
+{
+}
+
+void RenderSVGForeignObject::paint(PaintInfo& paintInfo, int, int)
+{
+ if (paintInfo.context->paintingDisabled())
+ return;
+
+ PaintInfo childPaintInfo(paintInfo);
+ childPaintInfo.context->save();
+ childPaintInfo.applyTransform(localTransform());
+
+ if (SVGRenderSupport::isOverflowHidden(this))
+ childPaintInfo.context->clip(m_viewport);
+
+ float opacity = style()->opacity();
+ if (opacity < 1.0f)
+ childPaintInfo.context->beginTransparencyLayer(opacity);
+
+ RenderBlock::paint(childPaintInfo, 0, 0);
+
+ if (opacity < 1.0f)
+ childPaintInfo.context->endTransparencyLayer();
+
+ childPaintInfo.context->restore();
+}
+
+IntRect RenderSVGForeignObject::clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer)
+{
+ return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
+}
+
+void RenderSVGForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed)
+{
+ SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
+}
+
+const AffineTransform& RenderSVGForeignObject::localToParentTransform() const
+{
+ m_localToParentTransform = localTransform();
+ m_localToParentTransform.translate(m_viewport.x(), m_viewport.y());
+ return m_localToParentTransform;
+}
+
+void RenderSVGForeignObject::computeLogicalWidth()
+{
+ // FIXME: Investigate in size rounding issues
+ setWidth(static_cast<int>(roundf(m_viewport.width())));
+}
+
+void RenderSVGForeignObject::computeLogicalHeight()
+{
+ // FIXME: Investigate in size rounding issues
+ setHeight(static_cast<int>(roundf(m_viewport.height())));
+}
+
+void RenderSVGForeignObject::layout()
+{
+ ASSERT(needsLayout());
+ ASSERT(!view()->layoutStateEnabled()); // RenderSVGRoot disables layoutState for the SVG rendering tree.
+
+ LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
+ SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement*>(node());
+
+ bool updateCachedBoundariesInParents = false;
+ if (m_needsTransformUpdate) {
+ m_localTransform = foreign->animatedLocalTransform();
+ m_needsTransformUpdate = false;
+ updateCachedBoundariesInParents = true;
+ }
+
+ FloatRect oldViewport = m_viewport;
+
+ // Cache viewport boundaries
+ FloatPoint viewportLocation(foreign->x().value(foreign), foreign->y().value(foreign));
+ m_viewport = FloatRect(viewportLocation, FloatSize(foreign->width().value(foreign), foreign->height().value(foreign)));
+ if (!updateCachedBoundariesInParents)
+ updateCachedBoundariesInParents = oldViewport != m_viewport;
+
+ // Set box origin to the foreignObject x/y translation, so positioned objects in XHTML content get correct
+ // positions. A regular RenderBoxModelObject would pull this information from RenderStyle - in SVG those
+ // properties are ignored for non <svg> elements, so we mimic what happens when specifying them through CSS.
+
+ // FIXME: Investigate in location rounding issues - only affects RenderSVGForeignObject & RenderSVGText
+ setLocation(roundedIntPoint(viewportLocation));
+
+ bool layoutChanged = m_everHadLayout && selfNeedsLayout();
+ RenderBlock::layout();
+ ASSERT(!needsLayout());
+
+ // If our bounds changed, notify the parents.
+ if (updateCachedBoundariesInParents)
+ RenderSVGBlock::setNeedsBoundariesUpdate();
+
+ // Invalidate all resources of this client if our layout changed.
+ if (layoutChanged)
+ SVGResourcesCache::clientLayoutChanged(this);
+
+ repainter.repaintAfterLayout();
+}
+
+bool RenderSVGForeignObject::nodeAtFloatPoint(const HitTestRequest& request, HitTestResult& result, const FloatPoint& pointInParent, HitTestAction hitTestAction)
+{
+ FloatPoint localPoint = localTransform().inverse().mapPoint(pointInParent);
+
+ // Early exit if local point is not contained in clipped viewport area
+ if (SVGRenderSupport::isOverflowHidden(this) && !m_viewport.contains(localPoint))
+ return false;
+
+ IntPoint roundedLocalPoint = roundedIntPoint(localPoint);
+ return RenderBlock::nodeAtPoint(request, result, roundedLocalPoint.x(), roundedLocalPoint.y(), 0, 0, hitTestAction);
+}
+
+bool RenderSVGForeignObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, int, int, int, int, HitTestAction)
+{
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+{
+ // When crawling up the hierachy starting from foreignObject child content, useTransforms may not be set to true.
+ if (!useTransforms)
+ useTransforms = true;
+ SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
+}
+
+}
+
+#endif
diff --git a/Source/WebCore/rendering/svg/RenderSVGForeignObject.h b/Source/WebCore/rendering/svg/RenderSVGForeignObject.h
new file mode 100644
index 0000000..a1cf91a
--- /dev/null
+++ b/Source/WebCore/rendering/svg/RenderSVGForeignObject.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2009 Google, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef RenderSVGForeignObject_h
+#define RenderSVGForeignObject_h
+
+#if ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
+#include "AffineTransform.h"
+#include "FloatPoint.h"
+#include "RenderSVGBlock.h"
+
+namespace WebCore {
+
+class SVGForeignObjectElement;
+
+class RenderSVGForeignObject : public RenderSVGBlock {
+public:
+ explicit RenderSVGForeignObject(SVGForeignObjectElement*);
+ virtual ~RenderSVGForeignObject();
+
+ virtual const char* renderName() const { return "RenderSVGForeignObject"; }
+
+ virtual void paint(PaintInfo&, int parentX, int parentY);
+
+ virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
+ virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
+
+ virtual bool requiresLayer() const { return false; }
+ virtual void layout();
+
+ virtual FloatRect objectBoundingBox() const { return m_viewport; }
+ virtual FloatRect strokeBoundingBox() const { return m_viewport; }
+ virtual FloatRect repaintRectInLocalCoordinates() const { return m_viewport; }
+
+ virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
+ virtual bool isSVGForeignObject() const { return true; }
+
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState&) const;
+ virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
+
+private:
+ virtual void computeLogicalWidth();
+ virtual void computeLogicalHeight();
+
+ virtual const AffineTransform& localToParentTransform() const;
+ virtual AffineTransform localTransform() const { return m_localTransform; }
+
+ bool m_needsTransformUpdate : 1;
+ FloatRect m_viewport;
+ AffineTransform m_localTransform;
+ mutable AffineTransform m_localToParentTransform;
+};
+
+}
+
+#endif
+#endif
diff --git a/Source/WebCore/svg/SVGForeignObjectElement.cpp b/Source/WebCore/svg/SVGForeignObjectElement.cpp
index c2fcecb..6b5cd41 100644
--- a/Source/WebCore/svg/SVGForeignObjectElement.cpp
+++ b/Source/WebCore/svg/SVGForeignObjectElement.cpp
@@ -25,7 +25,7 @@
#include "Attribute.h"
#include "CSSPropertyNames.h"
-#include "RenderForeignObject.h"
+#include "RenderSVGForeignObject.h"
#include "RenderSVGResource.h"
#include "SVGLength.h"
#include "SVGNames.h"
@@ -139,7 +139,7 @@ void SVGForeignObjectElement::synchronizeProperty(const QualifiedName& attrName)
RenderObject* SVGForeignObjectElement::createRenderer(RenderArena* arena, RenderStyle*)
{
- return new (arena) RenderForeignObject(this);
+ return new (arena) RenderSVGForeignObject(this);
}
bool SVGForeignObjectElement::childShouldCreateRenderer(Node* child) const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list