diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/JavaScriptGlue/JSRun.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/JavaScriptGlue/JSRun.cpp')
-rw-r--r-- | Source/JavaScriptGlue/JSRun.cpp | 15 |
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) { } |