Changeset 52776 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.h

Timestamp:

Jan 4, 2010, 5:24:48 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: ​https://bugs.webkit.org/show_bug.cgi?id=33163
Add string hashing functions to WTF.
Use WTF's string hashing functions from UStringImpl.

Reviewed by Sam Weinig, additional coding by Mark Rowe.

• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/UStringImpl.cpp:
• runtime/UStringImpl.h:

(JSC::UStringImpl::computeHash):

• wtf/HashFunctions.h:
• wtf/StringHashFunctions.h: Added.

(WTF::stringHash):

JavaScriptGlue: Add a forwarding header so that StringHashFunctions.h can be found.

Reviewed by Sam Weinig.

• ForwardingHeaders/wtf/StringHashFunctions.h: Added.

WebCore: ​https://bugs.webkit.org/show_bug.cgi?id=33163
Use WTF's string hashing functions from StringImpl.

Patch by Mark Rowe <​[email protected]> on 2010-01-04
Reviewed by Sam Weinig.

• ForwardingHeaders/wtf/StringHashFunctions.h: Added.
• platform/text/StringHash.h:
• platform/text/StringImpl.h:

(WebCore::StringImpl::computeHash):

File:

• trunk/JavaScriptCore/runtime/UStringImpl.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -27 +27 @@
 #define UStringImpl_h
 
+#include <limits>
 #include <wtf/CrossThreadRefCounted.h>
 #include <wtf/OwnFastMallocPtr.h>
 #include <wtf/PossiblyNull.h>
+#include <wtf/StringHashFunctions.h>
 #include <wtf/unicode/Unicode.h>
-#include <limits>
 
 namespace JSC {
@@ -161 +162 @@
     }
 
-    static unsigned computeHash(const UChar*, int length);
-    static unsigned computeHash(const char*, int length);
-    static unsigned computeHash(const char* s) { return computeHash(s, strlen(s)); }
+    static unsigned computeHash(const UChar* s, int length) { ASSERT(length >= 0); return WTF::stringHash(s, length); }
+    static unsigned computeHash(const char* s, int length) { ASSERT(length >= 0); return WTF::stringHash(s, length); }
+    static unsigned computeHash(const char* s) { return WTF::stringHash(s); }
 
     static UStringImpl& null() { return *s_null; }