Changeset 61495 in webkit

Timestamp:

Jun 19, 2010 10:11:35 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-19 Jay Civelli <​jcivelli@chromium.org>

Reviewed by David Levin.

Adding a < operator to WebURLs so they can be used in std::maps.
​https://bugs.webkit.org/show_bug.cgi?id=40632

• public/WebCString.h: (WebKit::operator<):
• public/WebURL.h: (WebKit::operator<):
• src/WebCString.cpp: (WebKit::WebCString::compare):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebCString.h (modified) (2 diffs)
• public/WebURL.h (modified) (1 diff)
• src/WebCString.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-19  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by David Levin.
+
+        Adding a < operator to WebURLs so they can be used in std::maps.
+        https://bugs.webkit.org/show_bug.cgi?id=40632
+
+        * public/WebCString.h:
+        (WebKit::operator<):
+        * public/WebURL.h:
+        (WebKit::operator<):
+        * src/WebCString.cpp:
+        (WebKit::WebCString::compare):
+
 2010-06-19  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKit/chromium/public/WebCString.h

@@ -69 +69 @@
     }
 
+    // Returns 0 if both strings are equals, a value greater than zero if the
+    // first character that does not match has a greater value in this string
+    // than in |other|, or a value less than zero to indicate the opposite.
+    WEBKIT_API int compare(const WebCString& other) const;
+
     WEBKIT_API void reset();
     WEBKIT_API void assign(const WebCString&);
@@ -118 +123 @@
 };
 
+inline bool operator<(const WebCString& a, const WebCString& b)
+{
+    return a.compare(b) < 0;
+}
+
 } // namespace WebKit
 

trunk/WebKit/chromium/public/WebURL.h

@@ -139 +139 @@
 };
 
+inline bool operator<(const WebURL& a, const WebURL& b)
+{
+    return a.spec() < b.spec();
+}
+
 } // namespace WebKit
 

trunk/WebKit/chromium/src/WebCString.cpp

@@ -41 +41 @@
 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()