Changeset 34361 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 4, 2008, 11:10:15 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Fix JSClassCreate to work with old JSCore API threading model.

No change on SunSpider.

• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): Since JSClass is constructed without a context, there is no way for it to create Identifiers. Also, added initializeThreading(), just for good measure.

• API/JSCallbackObjectFunctions.h: (KJS::::getPropertyNames): Make an Identifier out of the string here, because propertyNames.add() needs that.

• kjs/identifier.cpp:
• kjs/identifier.h: (KJS::Identifier::equal):
• kjs/ustring.cpp: (KJS::equal): Moved equal() from identifier.h to ustring.h, because it's not really about Identifiers, and to make it possible to use it from StrHash. Include StrHash.h from ustring.h to avoid having the behavior depend on headers that happen to be included.

• wtf/StrHash.h: Removed.
• kjs/ustring.h: Made RefPtr<UString::Rep> use the same default hash as UString::Rep* (it used to default to pointer equality). Moved the whole StrHash header into ustring.h.

• JavaScriptCore.exp: Export equal() for WebCore use (this StrHash is used in c_class.cpp, jni_class.cpp, and npruntime.cpp).

Location:

trunk/JavaScriptCore/kjs

Files:

• identifier.cpp (modified) (2 diffs)
• identifier.h (modified) (1 diff)
• ustring.cpp (modified) (1 diff)
• ustring.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -29 +29 @@
 #include <wtf/FastMalloc.h>
 #include <wtf/HashSet.h>
-#include <wtf/StrHash.h>
 #if USE(MULTIPLE_THREADS)
 #include <wtf/ThreadSpecific.h>
@@ -112 +111 @@
         return false;
     const UChar *d = r->data();
-    for (int i = 0; i != length; ++i)
-        if (d[i] != s[i])
-            return false;
-    return true;
-}
-
-bool Identifier::equal(const UString::Rep *r, const UString::Rep *b)
-{
-    int length = r->len;
-    if (length != b->len)
-        return false;
-    const UChar *d = r->data();
-    const UChar *s = b->data();
     for (int i = 0; i != length; ++i)
         if (d[i] != s[i])

trunk/JavaScriptCore/kjs/identifier.h

@@ -66 +66 @@
         static bool equal(const UString::Rep*, const char*);
         static bool equal(const UString::Rep*, const UChar*, int length);
-        static bool equal(const UString::Rep*, const UString::Rep*);
+        static bool equal(const UString::Rep* a, const UString::Rep* b) { return KJS::equal(a, b); }
 
         static PassRefPtr<UString::Rep> add(const char*);

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -1316 +1316 @@
 }
 
+bool equal(const UString::Rep* r, const UString::Rep* b)
+{
+    int length = r->len;
+    if (length != b->len)
+        return false;
+    const UChar* d = r->data();
+    const UChar* s = b->data();
+    for (int i = 0; i != length; ++i)
+        if (d[i] != s[i])
+            return false;
+    return true;
+}
+
 CString UString::UTF8String(bool strict) const
 {

trunk/JavaScriptCore/kjs/ustring.h

@@ -382 +382 @@
   int compare(const UString &, const UString &);
 
+  bool equal(const UString::Rep*, const UString::Rep*);
+
+
 inline UString::UString()
   : m_rep(&Rep::null)
@@ -430 +433 @@
 }
 
-} // namespace
+} // namespace KJS
+
+
+namespace WTF {
+
+    template<typename T> struct DefaultHash;
+    template<typename T> struct StrHash;
+
+    template<> struct StrHash<KJS::UString::Rep*> {
+        static unsigned hash(const KJS::UString::Rep* key) { return key->hash(); }
+        static bool equal(const KJS::UString::Rep* a, const KJS::UString::Rep* b) { return KJS::equal(a, b); }
+        static const bool safeToCompareToEmptyOrDeleted = false;
+    };
+
+    template<> struct StrHash<RefPtr<KJS::UString::Rep> > : public StrHash<KJS::UString::Rep*> {
+        using StrHash<KJS::UString::Rep*>::hash;
+        static unsigned hash(const RefPtr<KJS::UString::Rep>& key) { return key->hash(); }
+        using StrHash<KJS::UString::Rep*>::equal;
+        static bool equal(const RefPtr<KJS::UString::Rep>& a, const RefPtr<KJS::UString::Rep>& b) { return KJS::equal(a.get(), b.get()); }
+        static bool equal(const KJS::UString::Rep* a, const RefPtr<KJS::UString::Rep>& b) { return KJS::equal(a, b.get()); }
+        static bool equal(const RefPtr<KJS::UString::Rep>& a, const KJS::UString::Rep* b) { return KJS::equal(a.get(), b); }
+
+        static const bool safeToCompareToEmptyOrDeleted = false;
+    };
+
+    template<> struct DefaultHash<KJS::UString::Rep*> {
+        typedef StrHash<KJS::UString::Rep*> Hash;
+    };
+
+    template<> struct DefaultHash<RefPtr<KJS::UString::Rep> > {
+        typedef StrHash<RefPtr<KJS::UString::Rep> > Hash;
+    };
+} // namespace WTF
 
 #endif