summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptGlue/JSRun.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptGlue/JSRun.cpp')
-rw-r--r--Source/JavaScriptGlue/JSRun.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/Source/JavaScriptGlue/JSRun.cpp b/Source/JavaScriptGlue/JSRun.cpp
index 78151c1..a8096aa 100644
--- a/Source/JavaScriptGlue/JSRun.cpp
+++ b/Source/JavaScriptGlue/JSRun.cpp
@@ -33,22 +33,17 @@
#include <JavaScriptCore/Completion.h>
#include <JavaScriptCore/SourceCode.h>
-JSGlueGlobalObject::JSGlueGlobalObject(PassRefPtr<Structure> structure, JSFlags flags)
- : JSGlobalObject(structure, new Data, this)
+JSGlueGlobalObject::JSGlueGlobalObject(JSGlobalData& globalData, PassRefPtr<Structure> structure, JSFlags flags)
+ : JSGlobalObject(structure)
+ , m_flags(flags)
+ , m_userObjectStructure(UserObjectImp::createStructure(globalData, jsNull()))
{
- d()->flags = flags;
- d()->userObjectStructure = UserObjectImp::createStructure(jsNull());
-}
-
-void JSGlueGlobalObject::destroyData(void* data)
-{
- delete static_cast<Data*>(data);
}
JSRun::JSRun(CFStringRef source, JSFlags inFlags)
: JSBase(kJSRunTypeID),
fSource(CFStringToUString(source)),
- fGlobalObject(getThreadGlobalExecState()->globalData(), new (&getThreadGlobalExecState()->globalData()) JSGlueGlobalObject(JSGlueGlobalObject::createStructure(jsNull()), inFlags)),
+ fGlobalObject(getThreadGlobalExecState()->globalData(), new (&getThreadGlobalExecState()->globalData()) JSGlueGlobalObject(getThreadGlobalExecState()->globalData(), JSGlueGlobalObject::createStructure(getThreadGlobalExecState()->globalData(), jsNull()), inFlags)),
fFlags(inFlags)
{
}