JavaScriptCore-7600.1.4.16.1.tar.gz

[apple/javascriptcore.git] / API / JSWeakObjectMapRefPrivate.cpp

diff --git a/API/JSWeakObjectMapRefPrivate.cpp b/API/JSWeakObjectMapRefPrivate.cpp
index 13900cf8327b4f026e203f4a12cb58464c203a14..446cf90135161ec24eb8eb5db12f934132fac754 100644 (file)
--- a/API/JSWeakObjectMapRefPrivate.cpp
+++ b/API/JSWeakObjectMapRefPrivate.cpp
@@ -27,10 +27,11 @@
 #include "JSWeakObjectMapRefPrivate.h"
 
 #include "APICast.h"
 #include "JSWeakObjectMapRefPrivate.h"
 
 #include "APICast.h"

-#include "APIShims.h"
+#include "JSCJSValue.h"

 #include "JSCallbackObject.h"
 #include "JSCallbackObject.h"

-#include "JSValue.h"

 #include "JSWeakObjectMapRefInternal.h"
 #include "JSWeakObjectMapRefInternal.h"

+#include "JSCInlines.h"
+#include "Weak.h"

 #include <wtf/HashMap.h>
 #include <wtf/text/StringHash.h>
 
 #include <wtf/HashMap.h>
 #include <wtf/text/StringHash.h>
 


@@ -44,7 +45,7 @@ extern "C" {
 JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef context, void* privateData, JSWeakMapDestroyedCallback callback)
 {
     ExecState* exec = toJS(context);
 JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef context, void* privateData, JSWeakMapDestroyedCallback callback)
 {
     ExecState* exec = toJS(context);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

     RefPtr<OpaqueJSWeakObjectMap> map = OpaqueJSWeakObjectMap::create(privateData, callback);
     exec->lexicalGlobalObject()->registerWeakMap(map.get());
     return map.get();
     RefPtr<OpaqueJSWeakObjectMap> map = OpaqueJSWeakObjectMap::create(privateData, callback);
     exec->lexicalGlobalObject()->registerWeakMap(map.get());
     return map.get();


@@ -52,27 +53,41 @@ JSWeakObjectMapRef JSWeakObjectMapCreate(JSContextRef context, void* privateData
 
 void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef object)
 {
 
 void JSWeakObjectMapSet(JSContextRef ctx, JSWeakObjectMapRef map, void* key, JSObjectRef object)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
+    JSLockHolder locker(exec);

     JSObject* obj = toJS(object);
     if (!obj)
         return;
     JSObject* obj = toJS(object);
     if (!obj)
         return;

-    ASSERT(obj->inherits(&JSCallbackObject<JSGlobalObject>::s_info) || obj->inherits(&JSCallbackObject<JSObjectWithGlobalObject>::s_info));
-    map->map().set(exec->globalData(), key, obj);
+    ASSERT(obj->inherits(JSProxy::info())
+        || obj->inherits(JSCallbackObject<JSGlobalObject>::info()) 
+        || obj->inherits(JSCallbackObject<JSDestructibleObject>::info()));
+    map->map().set(key, obj);

 }
 
 JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void* key)
 {
 }
 
 JSObjectRef JSWeakObjectMapGet(JSContextRef ctx, JSWeakObjectMapRef map, void* key)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return 0;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
-    return toRef(static_cast<JSObject*>(map->map().get(key)));
+    JSLockHolder locker(exec);
+    return toRef(jsCast<JSObject*>(map->map().get(key)));

 }
 
 void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key)
 {
 }
 
 void JSWeakObjectMapRemove(JSContextRef ctx, JSWeakObjectMapRef map, void* key)
 {

+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    APIEntryShim entryShim(exec);
-    map->map().take(key);
+    JSLockHolder locker(exec);
+    map->map().remove(key);

 }
 
 // We need to keep this function in the build to keep the nightlies running.
 }
 
 // We need to keep this function in the build to keep the nightlies running.