Bug #: 3959

Submitted by: eseidel
Reviewed by: adele
        * kdom/Namespace.h: Merged in XPath 2.0 namespace def from KDE.
        * kdom/Shared.h: Merged in comments from KDE.
        * kdom/kdom.h: Changed local // to use #ifndef APPLE_CHANGES
        (KDOM::operator<<):
        A tiny batch of changes I wished to commit before moving
        WebCore/kdom to SVGSupport/kdom.

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

diff --git a/SVGSupport/kdom/Namespace.h b/SVGSupport/kdom/Namespace.h
index c6ad593a9d90fcfb0a772932c917f0c6f23eec79..12e233139a34d952c4c6b71236595cd278e35b2f 100644 (file)
--- a/SVGSupport/kdom/Namespace.h
+++ b/SVGSupport/kdom/Namespace.h
@@ -158,6 +158,12 @@ namespace KDOM
         * Specification: http://www.w3.org/TR/xpath20/#id-identifying-errors
         */
        const DOMString NS_XPERR = "http://www.w3.org/2004/07/xqt-errors";
+
+       /**
+        * The XPath 2.0 Unicode codepoint collation URI identifier. Collations
+        * specifies how strings are compared and ordered.
+        */
+       const DOMString NS_UNICODE_COLLATION = "http://www.w3.org/2005/04/xpath-functions/collation/codepoint";
 };
 
 #endif // KDOM_Namespace_h

diff --git a/SVGSupport/kdom/Shared.h b/SVGSupport/kdom/Shared.h
index 2e8bd9d857cb84195f2860e2f3d2d6908b43252e..5c580c4fb579c5c5fa70e3e8e87426f5d4e9a879 100644 (file)
--- a/SVGSupport/kdom/Shared.h
+++ b/SVGSupport/kdom/Shared.h
@@ -68,10 +68,18 @@ bool T::operator!=(const T &other) const { \
 } \
 
 /**
+ * Add a null object singleton to the class, of the class' type.
+ * This makes for efficient storage and can be used in comparisons
+ * like this: someNode.firstChild() != Node::null; .
+ *
+ * TODO: is there demand for isNull() convenience method? If so, add
+ * here.
  */
 #define KDOM_INTERNAL(ClassName) static ClassName null; typedef ClassName##Impl Private;
 
 /**
+ * Base classes have a handle() convenience method that gives back
+ * the internal impl pointer, in addition to the null object singleton.
  */
 #define KDOM_INTERNAL_BASE(ClassName) KDOM_INTERNAL(ClassName) ClassName##Impl *handle() const { return d; }
 

diff --git a/SVGSupport/kdom/kdom.h b/SVGSupport/kdom/kdom.h
index 043118c2741cbaf366378c8ab6dc8684479e5ef3..e5fcb64772099d8911912c820e8e54c725eccb65 100644 (file)
--- a/SVGSupport/kdom/kdom.h
+++ b/SVGSupport/kdom/kdom.h
@@ -109,7 +109,9 @@ namespace KDOM
        #define isImplicitNode(n) (false) // TODO: check that when khtml2 is ready
 
        // Debugging helper
-       //inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &string) { return (stream << string.string()); }
+#ifndef APPLE_CHANGES
+       inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &string) { return (stream << string.string()); }
+#endif
        inline kdbgstream  &operator<<(kdbgstream  &stream, const DOMString &string) { return (stream << string.string()); }
 };
 

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 898b2d7366489e600f9b28368438d430d13c3d62..900387a9d12b976d2d1934a453ea4b4b09038dc7 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2005-07-11  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by Adele.
+
+        * kdom/Namespace.h: Merged in XPath 2.0 namespace def from KDE.
+        * kdom/Shared.h: Merged in comments from KDE.
+        * kdom/kdom.h: Changed local // to use #ifndef APPLE_CHANGES
+        (KDOM::operator<<):
+        A tiny batch of changes I wished to commit before moving
+        WebCore/kdom to SVGSupport/kdom.
+
 2005-07-11  Geoffrey Garen  <ggaren@apple.com>
 
        -fixed rdar://problem/4170960