top level:
Reviewed by Eric and Darin.
<rdar://problem/4260506> Port JavaScriptGlue to TOT JavaScriptCore
* Makefile.am:
* configure.in:
JavaScriptGlue:
Reviewed by Eric and Darin.
<rdar://problem/4260506> Port JavaScriptGlue to TOT JavaScriptCore
* JSRun.cpp:
(JSRun::JSRun):
(JSRun::GlobalObject):
* JSRun.h:
(JSInterpreter::JSInterpreter):
* JSUtils.cpp:
(KJSValueToJSObject):
(JSObjectKJSValue):
(KJSValueToCFTypeInternal):
(KJSValueToCFType):
* JSUtils.h:
* JSValueWrapper.cpp:
(JSValueWrapper::JSValueWrapper):
(JSValueWrapper::GetValue):
(JSValueWrapper::JSObjectCopyPropertyNames):
(JSValueWrapper::JSObjectCopyProperty):
(JSValueWrapper::JSObjectSetProperty):
(JSValueWrapper::JSObjectCallFunction):
(JSValueWrapper::JSObjectMark):
* JSValueWrapper.h:
* JavaScriptGlue.cpp:
(JSRunCopyGlobalObject):
* JavaScriptGlue.xcodeproj/project.pbxproj:
* Makefile.am: Added.
* UserObjectImp.cpp:
(UserObjectPrototypeImp::GlobalUserObjectPrototypeImp):
(UserObjectImp::UserObjectImp):
(UserObjectImp::callAsFunction):
(UserObjectImp::getPropertyNames):
(UserObjectImp::userObjectGetter):
(UserObjectImp::getOwnPropertySlot):
(UserObjectImp::put):
(UserObjectImp::toPrimitive):
(UserObjectImp::mark):
* UserObjectImp.h:
* kxmlcore/FastMalloc.h: Added.
* kxmlcore/HashSet.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@12203 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptGlue/JSRun.h b/JavaScriptGlue/JSRun.h
index 6d6f76c..cc2c4e7 100644
--- a/JavaScriptGlue/JSRun.h
+++ b/JavaScriptGlue/JSRun.h
@@ -10,8 +10,8 @@
class JSInterpreter : public Interpreter {
public:
- JSInterpreter(const Object &global, JSFlags flags) : Interpreter(global), fJSFlags(flags) { }
- JSInterpreter(const Object &global) : Interpreter(global), fJSFlags(kJSFlagNone) { }
+ JSInterpreter(ObjectImp *global, JSFlags flags) : Interpreter(global), fJSFlags(flags) { }
+ JSInterpreter(ObjectImp *global) : Interpreter(global), fJSFlags(kJSFlagNone) { }
JSInterpreter() : Interpreter(), fJSFlags(kJSFlagNone) { }
JSInterpreter::~JSInterpreter() { }
JSFlags Flags() const { return fJSFlags; }
@@ -25,16 +25,16 @@
virtual ~JSRun();
UString GetSource() const;
- Object GlobalObject() const;
+ ObjectImp *GlobalObject() const;
JSInterpreter* GetInterpreter();
Completion Evaluate();
bool CheckSyntax();
JSFlags Flags() const;
private:
UString fSource;
- ProtectedObject fGlobalObject;
+ ProtectedPtr<ObjectImp> fGlobalObject;
JSInterpreter fInterpreter;
JSFlags fFlags;
};
-#endif
\ No newline at end of file
+#endif
