1 files changed, 19 insertions, 7 deletions
diff --git a/WebKit/chromium/src/WebCString.cpp b/WebKit/chromium/src/WebCString.cpp
index 82fbac0..f81d7f4 100644
--- a/WebKit/chromium/src/WebCString.cpp
+++ b/WebKit/chromium/src/WebCString.cpp
@@ -31,16 +31,28 @@
 #include "config.h"
 #include "WebCString.h"
 
-#include "CString.h"
 #include "TextEncoding.h"
+#include <wtf/text/CString.h>
 
 #include "WebString.h"
 
 namespace WebKit {
 
-class WebCStringPrivate : public WebCore::CStringBuffer {
+class WebCStringPrivate : public WTF::CStringBuffer {
 };
 
+int WebCString::compare(const WebCString& other) const
+{
+    // A null string is always less than a non null one.
+    if (isNull() != other.isNull())
+        return isNull() ? -1 : 1;
+
+    if (isNull())
+        return 0; // Both WebStrings are null.
+
+    return strcmp(m_private->data(), other.m_private->data());
+}
+
 void WebCString::reset()
 {
     if (m_private) {
@@ -57,8 +69,8 @@ void WebCString::assign(const WebCString& other)
 void WebCString::assign(const char* data, size_t length)
 {
     char* newData;
-    RefPtr<WebCore::CStringBuffer> buffer =
-        WebCore::CString::newUninitialized(length, newData).buffer();
+    RefPtr<WTF::CStringBuffer> buffer =
+        WTF::CString::newUninitialized(length, newData).buffer();
     memcpy(newData, data, length);
     assign(static_cast<WebCStringPrivate*>(buffer.get()));
 }
@@ -97,20 +109,20 @@ WebCString WebCString::fromUTF16(const WebUChar* data)
     return fromUTF16(data, len);
 }
 
-WebCString::WebCString(const WebCore::CString& s)
+WebCString::WebCString(const WTF::CString& s)
     : m_private(static_cast<WebCStringPrivate*>(s.buffer()))
 {
     if (m_private)
         m_private->ref();
 }
 
-WebCString& WebCString::operator=(const WebCore::CString& s)
+WebCString& WebCString::operator=(const WTF::CString& s)
 {
     assign(static_cast<WebCStringPrivate*>(s.buffer()));
     return *this;
 }
 
-WebCString::operator WebCore::CString() const
+WebCString::operator WTF::CString() const
 {
     return m_private;
 }