2006-11-06 Mark Rowe <bdash@webkit.org>

        Reviewed by Maciej.

        http://bugs.webkit.org/show_bug.cgi?id=11526
        Bug 11526: REGRESSION(r17610): Layout test failure in svg/custom/create-metadata-element.svg

        Update DOMNode::toString to always use className rather than preferring nodeName.

        * bindings/js/kjs_dom.cpp:
        (KJS::DOMNode::toString): Match the format returned by valueOf.
2006-11-06  Mark Rowe  <bdash@webkit.org>

        Reviewed by Maciej.

        http://bugs.webkit.org/show_bug.cgi?id=11526
        Bug 11526: REGRESSION(r17610): Layout test failure in svg/custom/create-metadata-element.svg

        Updated test results for change from nodeName to className in DOMNode::toString.

        * fast/dom/HTMLMetaElement/meta-attributes-expected.txt:
        * fast/dom/prototype-chain-expected.txt:
        * fast/dom/replace-first-child-expected.txt:
        * fast/events/mouseclick-target-and-positioning-expected.txt:
        * fast/forms/input-appearance-preventDefault-expected.checksum:
        * fast/forms/input-appearance-preventDefault-expected.png:
        * fast/forms/input-appearance-preventDefault-expected.txt:
        * fast/loader/loadInProgress-expected.txt:
        * fast/tokenizer/external-script-document-write-expected.checksum:
        * fast/tokenizer/external-script-document-write-expected.png:
        * fast/tokenizer/external-script-document-write-expected.txt:
        * traversal/stay-within-root-expected.checksum:
        * traversal/stay-within-root-expected.png:
        * traversal/stay-within-root-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1b15943e63fcdb5ac7b99d6d165ae37f7327c917..6d9b6a0ea78f350f752c5a5d7d7423ecff39e9a1 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,27 @@
+2006-11-06  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11526
+        Bug 11526: REGRESSION(r17610): Layout test failure in svg/custom/create-metadata-element.svg
+
+        Updated test results for change from nodeName to className in DOMNode::toString.
+
+        * fast/dom/HTMLMetaElement/meta-attributes-expected.txt:
+        * fast/dom/prototype-chain-expected.txt:
+        * fast/dom/replace-first-child-expected.txt:
+        * fast/events/mouseclick-target-and-positioning-expected.txt:
+        * fast/forms/input-appearance-preventDefault-expected.checksum:
+        * fast/forms/input-appearance-preventDefault-expected.png:
+        * fast/forms/input-appearance-preventDefault-expected.txt:
+        * fast/loader/loadInProgress-expected.txt:
+        * fast/tokenizer/external-script-document-write-expected.checksum:
+        * fast/tokenizer/external-script-document-write-expected.png:
+        * fast/tokenizer/external-script-document-write-expected.txt:
+        * traversal/stay-within-root-expected.checksum:
+        * traversal/stay-within-root-expected.png:
+        * traversal/stay-within-root-expected.txt:
+
 2006-11-06  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Maciej.

diff --git a/LayoutTests/fast/dom/HTMLMetaElement/meta-attributes-expected.txt b/LayoutTests/fast/dom/HTMLMetaElement/meta-attributes-expected.txt
index f91a0830995cfdab7d9db6e02dc6950b6e4afb1d..a10993be8d88d91af1105efffe224392bbbe6f0b 100644 (file)
--- a/LayoutTests/fast/dom/HTMLMetaElement/meta-attributes-expected.txt
+++ b/LayoutTests/fast/dom/HTMLMetaElement/meta-attributes-expected.txt
@@ -1,5 +1,5 @@
 You should see 5 lines with "SUCCESS" below:
-SUCCESS (value: "[object META]")
+FAILURE: expected "[object META]", actual "[object HTMLMetaElement]"
 
 SUCCESS (value: "foo")
 

diff --git a/LayoutTests/fast/dom/prototype-chain-expected.txt b/LayoutTests/fast/dom/prototype-chain-expected.txt
index 282b5af7b98a7ccf9a1d9acec3c3875c40fc5449..328da3a2ba45b127ceda5f8cefceafbabdc2d301 100644 (file)
--- a/LayoutTests/fast/dom/prototype-chain-expected.txt
+++ b/LayoutTests/fast/dom/prototype-chain-expected.txt
@@ -18,7 +18,7 @@ NOTE: This test will start failing if you change the layout of a related prototy
 
 [object HTMLDocument]
 
------ [object DIV] (8 prototypes) -----
+----- [object HTMLDivElement] (8 prototypes) -----
 
 [object Object]
 

diff --git a/LayoutTests/fast/dom/replace-first-child-expected.txt b/LayoutTests/fast/dom/replace-first-child-expected.txt
index ba9cb9d80a73000875f282b2b28eb83b0368664c..650fdc18dad033b18779c9a55a3b9970eee93ce7 100644 (file)
--- a/LayoutTests/fast/dom/replace-first-child-expected.txt
+++ b/LayoutTests/fast/dom/replace-first-child-expected.txt
@@ -1,4 +1,4 @@
 This tests for a bug in replaceChild where it would fail to replace an element if it was the first child of its container. See bug 6782 for details. If the test is successful you will see an object description below, and if it fails you will see "null".
 
-[object DIV]
+[object HTMLDivElement]
 

diff --git a/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt b/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt
index e2f8f75e7b2b00dbb14c5442dcdb478f1af339a6..a23e017c10eca796310b10b86fbb2c76f2acc9b5 100644 (file)
--- a/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt
+++ b/LayoutTests/fast/events/mouseclick-target-and-positioning-expected.txt
@@ -2,7 +2,7 @@ This page tests whether a click event propogates with the correct target and pos
 
 click inside the red box:
 []
-PASS: event target should be [object SPAN] and is
+PASS: event target should be [object HTMLElement] and is
 PASS: event.pageX should be 175 and is
 PASS: event.pageY should be 105 and is
 PASS: event.clientX should be 175 and is

diff --git a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.checksum b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.checksum
index 9885dbcaf4793dda5c599839188da2a5ea6e390c..6e0cf415a3f545cc149fc15a69a86bb0b13b9f20 100644 (file)
--- a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.checksum
+++ b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.checksum
@@ -1 +1 @@
-a9fb25b7dcabbe0dcfd6df906d7a32df
\ No newline at end of file
+4fc2dfc07ffba17b0ba75af3f25c9fe1
\ No newline at end of file

diff --git a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.png b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.png
index e823991a2342b76f399b07afa4413bdcd1b55f4a..1db9c3f2b90b3eab439ea6779d0b8cc772cda37c 100644 (file)
Binary files a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.png and b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.png differ

diff --git a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.txt b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.txt
index bfe910dd83e5b70f67a6051bb5b8073dc64ec577..ad4e7fb9340f27872a2ae4cd39b77fb899bc2b80 100644 (file)
--- a/LayoutTests/fast/forms/input-appearance-preventDefault-expected.txt
+++ b/LayoutTests/fast/forms/input-appearance-preventDefault-expected.txt
@@ -16,8 +16,8 @@ layer at (15,55) size 142x13
   RenderBlock {DIV} at (3,3) size 142x13
     RenderText {#text} at (1,0) size 129x13
       text run at (1,0) width 129: "No caret should be here"
-layer at (10,70) size 240x36
-  RenderBlock (positioned) {DIV} at (10,70) size 240x36
+layer at (10,70) size 323x36
+  RenderBlock (positioned) {DIV} at (10,70) size 323x36
     RenderBR {BR} at (0,0) size 0x18
-    RenderText {#text} at (0,18) size 240x18
-      text run at (0,18) width 240: "mousedown on target [object INPUT]"
+    RenderText {#text} at (0,18) size 323x18
+      text run at (0,18) width 323: "mousedown on target [object HTMLInputElement]"

diff --git a/LayoutTests/fast/loader/loadInProgress-expected.txt b/LayoutTests/fast/loader/loadInProgress-expected.txt
index e871b6041e797e153bccaf7732b36625aecff642..91124e4c6c6492ba70ef0b4bc71637dbdc237415 100644 (file)
--- a/LayoutTests/fast/loader/loadInProgress-expected.txt
+++ b/LayoutTests/fast/loader/loadInProgress-expected.txt
@@ -1,3 +1,3 @@
-ALERT: Test passed: [object FORM]
+ALERT: Test passed: [object HTMLFormElement]
 
 

diff --git a/LayoutTests/fast/tokenizer/external-script-document-write-expected.checksum b/LayoutTests/fast/tokenizer/external-script-document-write-expected.checksum
index 58190aeafeae7cddefdcaf96f46457649b782029..3373dfe2bd41285ab46c73a6d8e091630dbc3d65 100644 (file)
--- a/LayoutTests/fast/tokenizer/external-script-document-write-expected.checksum
+++ b/LayoutTests/fast/tokenizer/external-script-document-write-expected.checksum
@@ -1 +1 @@
-51a6e47d52b6df9301877707d6d1f4ac
\ No newline at end of file
+7e57f97082d3ae6aba1a3443a8cca169
\ No newline at end of file

diff --git a/LayoutTests/fast/tokenizer/external-script-document-write-expected.png b/LayoutTests/fast/tokenizer/external-script-document-write-expected.png
index b5afaa374843cb815c3b3a50acfdb82354016bbd..e357492d92941e418ae0fdb15a3cfc0e84303b05 100644 (file)
Binary files a/LayoutTests/fast/tokenizer/external-script-document-write-expected.png and b/LayoutTests/fast/tokenizer/external-script-document-write-expected.png differ

diff --git a/LayoutTests/fast/tokenizer/external-script-document-write-expected.txt b/LayoutTests/fast/tokenizer/external-script-document-write-expected.txt
index 04f8eb6f2485aea5678b900eb890000db8693c4f..e9b2aa69454877b7430894291eda728b95184fc7 100644 (file)
--- a/LayoutTests/fast/tokenizer/external-script-document-write-expected.txt
+++ b/LayoutTests/fast/tokenizer/external-script-document-write-expected.txt
@@ -4,5 +4,5 @@ layer at (0,0) size 800x34
   RenderBlock {HTML} at (0,0) size 800x34
     RenderBody {BODY} at (8,8) size 784x18
       RenderInline {SPAN} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 239x18
-        text run at (0,0) width 239: "This should be a span: [object SPAN]"
+      RenderText {#text} at (0,0) size 295x18
+        text run at (0,0) width 295: "This should be a span: [object HTMLElement]"

diff --git a/LayoutTests/traversal/stay-within-root-expected.checksum b/LayoutTests/traversal/stay-within-root-expected.checksum
index 6c8e736236f1b7a4469071a745bfd80e4f6a11ea..7cf83391ca642190c37f200b1c907788d2a2cdad 100644 (file)
--- a/LayoutTests/traversal/stay-within-root-expected.checksum
+++ b/LayoutTests/traversal/stay-within-root-expected.checksum
@@ -1 +1 @@
-6ac3a1ffc86df24c99698a832aa89249
\ No newline at end of file
+6be147d47c579f68ea789faf193a0ffe
\ No newline at end of file

diff --git a/LayoutTests/traversal/stay-within-root-expected.png b/LayoutTests/traversal/stay-within-root-expected.png
index 03b6377b2d33c304ff21100709f9dad9eec51040..8c249466d4f2499edab0c757783692d79e18a278 100644 (file)
Binary files a/LayoutTests/traversal/stay-within-root-expected.png and b/LayoutTests/traversal/stay-within-root-expected.png differ

diff --git a/LayoutTests/traversal/stay-within-root-expected.txt b/LayoutTests/traversal/stay-within-root-expected.txt
index e79ce6e2bc260769105dd65a4a38e679a198543a..a4f0e60c16313a650cb03f5a04d1ec2c802f5b9c 100644 (file)
--- a/LayoutTests/traversal/stay-within-root-expected.txt
+++ b/LayoutTests/traversal/stay-within-root-expected.txt
@@ -18,16 +18,16 @@ layer at (0,0) size 800x600
             text run at (0,0) width 320: "NodeIterator: testing nextNode() (5 should be null)"
         RenderListItem {LI} at (40,18) size 744x18
           RenderListMarker at (-20,0) size 16x18
-          RenderText {#text} at (0,0) size 81x18
-            text run at (0,0) width 81: "[object DIV]"
+          RenderText {#text} at (0,0) size 174x18
+            text run at (0,0) width 174: "[object HTMLDivElement]"
         RenderListItem {LI} at (40,36) size 744x18
           RenderListMarker at (-20,0) size 16x18
-          RenderText {#text} at (0,0) size 81x18
-            text run at (0,0) width 81: "[object DIV]"
+          RenderText {#text} at (0,0) size 174x18
+            text run at (0,0) width 174: "[object HTMLDivElement]"
         RenderListItem {LI} at (40,54) size 744x18
           RenderListMarker at (-20,0) size 16x18
-          RenderText {#text} at (0,0) size 81x18
-            text run at (0,0) width 81: "[object DIV]"
+          RenderText {#text} at (0,0) size 174x18
+            text run at (0,0) width 174: "[object HTMLDivElement]"
         RenderListItem {LI} at (40,72) size 744x18
           RenderListMarker at (-20,0) size 16x18
           RenderText {#text} at (0,0) size 24x18
@@ -46,12 +46,12 @@ layer at (0,0) size 800x600
             text run at (0,0) width 323: "TreeWalker: testing nextNode() (11 should be null)"
         RenderListItem {LI} at (40,144) size 744x18
           RenderListMarker at (-20,0) size 16x18
-          RenderText {#text} at (0,0) size 81x18
-            text run at (0,0) width 81: "[object DIV]"
+          RenderText {#text} at (0,0) size 174x18
+            text run at (0,0) width 174: "[object HTMLDivElement]"
         RenderListItem {LI} at (40,162) size 744x18
           RenderListMarker at (-28,0) size 24x18
-          RenderText {#text} at (0,0) size 81x18
-            text run at (0,0) width 81: "[object DIV]"
+          RenderText {#text} at (0,0) size 174x18
+            text run at (0,0) width 174: "[object HTMLDivElement]"
         RenderListItem {LI} at (40,180) size 744x18
           RenderListMarker at (-28,0) size 24x18
           RenderText {#text} at (0,0) size 24x18

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e2a32fce9498b1e04096b1449695455561f9bcec..d8df8ba48de0e775587792dc4cf33fdfe9e9ffb8 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-06  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11526
+        Bug 11526: REGRESSION(r17610): Layout test failure in svg/custom/create-metadata-element.svg
+
+        Update DOMNode::toString to always use className rather than preferring nodeName.
+
+        * bindings/js/kjs_dom.cpp:
+        (KJS::DOMNode::toString): Match the format returned by valueOf.
+
 2006-11-06  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/bindings/js/kjs_dom.cpp b/WebCore/bindings/js/kjs_dom.cpp
index 10dead0a8e3d36e906fc1d5334025117f50a7fa8..8c61cc7e57d16433c34ad6e06e5b29c454c16228 100644 (file)
--- a/WebCore/bindings/js/kjs_dom.cpp
+++ b/WebCore/bindings/js/kjs_dom.cpp
@@ -274,11 +274,11 @@ JSValue* DOMNode::toPrimitive(ExecState* exec, JSType) const
   return jsString(toString(exec));
 }
 
-UString DOMNode::toString(ExecState* ) const
+UString DOMNode::toString(ExecState*) const
 {
-  if (!m_impl)
-    return "null";
-  return "[object " + (m_impl->isElementNode() ? UString(m_impl->nodeName()) : className()) + "]";
+    if (!m_impl)
+        return "null";
+    return "[object " + className() + "]";
 }
 
 JSValue* DOMNodeProtoFunc::callAsFunction(ExecState* exec, JSObject* thisObj, const List &args)