diff options
Diffstat (limited to 'JavaScriptGlue/JSUtils.h')
| -rw-r--r-- | JavaScriptGlue/JSUtils.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/JavaScriptGlue/JSUtils.h b/JavaScriptGlue/JSUtils.h index 1fe8428..94d7458 100644 --- a/JavaScriptGlue/JSUtils.h +++ b/JavaScriptGlue/JSUtils.h @@ -31,10 +31,10 @@ #include "JavaScriptGlue.h" -#include <JavaScriptCore/value.h> -#include <JavaScriptCore/object.h> +#include <JavaScriptCore/JSValue.h> +#include <JavaScriptCore/JSLock.h> +#include <JavaScriptCore/JSObject.h> #include <JavaScriptCore/JSGlobalObject.h> -#include <JavaScriptCore/types.h> #include <JavaScriptCore/interpreter.h> #include <JavaScriptCore/protect.h> #include <JavaScriptCore/collector.h> @@ -42,7 +42,7 @@ #include <wtf/RefPtr.h> -using namespace KJS; +using namespace JSC; class JSBase; class JSUserObject; @@ -52,16 +52,18 @@ class JSUserObjectImp; UString CFStringToUString(CFStringRef inCFString); CFStringRef UStringToCFString(const UString& inUString); -Identifier CFStringToIdentifier(CFStringRef inCFString); +Identifier CFStringToIdentifier(CFStringRef inCFString, ExecState*); CFStringRef IdentifierToCFString(const Identifier& inIdentifier); -JSUserObject *KJSValueToJSObject(JSValue *inValue, ExecState *exec); -CFTypeRef KJSValueToCFType(JSValue *inValue, ExecState *exec); -JSValue *JSObjectKJSValue(JSUserObject* ptr); +JSUserObject *KJSValueToJSObject(JSValue* inValue, ExecState *exec); +CFTypeRef KJSValueToCFType(JSValue* inValue, ExecState *exec); +JSValue* JSObjectKJSValue(JSUserObject* ptr); CFTypeRef GetCFNull(void); inline CFTypeRef RetainCFType(CFTypeRef x) { if (x) x = CFRetain(x); return x; } inline void ReleaseCFType(CFTypeRef x) { if (x) CFRelease(x); } +ExecState* getThreadGlobalExecState(); + enum { kJSInvalidTypeID = 0, kJSObjectTypeID, |