Changeset 20057 in webkit

Timestamp:

Mar 8, 2007 12:48:55 AM (17 years ago)

Author:

ap

Message:

WebCore:

Build fix.

• xml/XPathUtil.cpp: (WebCore::XPath::stringValue):

LayoutTests:

Added a test for attribute node string-value.

• fast/xpath/string-value-expected.txt:
• fast/xpath/string-value.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/xpath/string-value-expected.txt (modified) (1 diff)
• LayoutTests/fast/xpath/string-value.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/xml/XPathUtil.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-03-08  Alexey Proskuryakov  <ap@webkit.org>
+
+        Added a test for attribute node string-value.
+
+        * fast/xpath/string-value-expected.txt:
+        * fast/xpath/string-value.html:
+
 2007-03-08  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/LayoutTests/fast/xpath/string-value-expected.txt

@@ -6 +6 @@
 PASS doc.evaluate('.', TEXT, null, XPathResult.STRING_TYPE, null).stringValue is '0  '
 PASS doc.evaluate('.', EMPTY, null, XPathResult.STRING_TYPE, null).stringValue is ''
+PASS doc.evaluate('.', ATTR, null, XPathResult.STRING_TYPE, null).stringValue is '<&nbsp;>'
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/xpath/string-value.html

@@ -42 +42 @@
     shouldBe("doc.evaluate('.', TEXT, null, XPathResult.STRING_TYPE, null).stringValue", "'0  '");
     shouldBe("doc.evaluate('.', EMPTY, null, XPathResult.STRING_TYPE, null).stringValue", "''");
+    shouldBe("doc.evaluate('.', ATTR, null, XPathResult.STRING_TYPE, null).stringValue", "'<&nbsp;>'");
 
     var successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-08  Alexey Proskuryakov  <ap@webkit.org>
+
+        Build fix.
+
+        * xml/XPathUtil.cpp:
+        (WebCore::XPath::stringValue):
+
 2007-03-08  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/xml/XPathUtil.cpp

@@ -56 +56 @@
                 for (Node* n = node->firstChild(); n; n = n->traverseNextNode(node))
                     if (n->isTextNode())
-                        str += nodeValue(n);
+                        str += n->nodeValue();
 
                 return str;