diff options
| author | ninerider <qt-info@nokia.com> | 2009-10-01 11:11:56 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-10-01 11:11:56 (GMT) |
| commit | c443a37d638be253fbda33e33ad2798951e04248 (patch) | |
| tree | 89a9d221ead07d029f0bbddcaeaf7432b8c6d4af /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp | |
| parent | c7689f394df5fa5526e51017bf132048d3a4aa96 (diff) | |
| parent | 3b37aff1e6c641290c155a6aa14d83167725556b (diff) | |
| download | Qt-c443a37d638be253fbda33e33ad2798951e04248.zip Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.gz Qt-c443a37d638be253fbda33e33ad2798951e04248.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp index 9907a8f..3bb281e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp @@ -121,7 +121,7 @@ JSGlobalObject::~JSGlobalObject() registerFile.setGlobalObject(0); registerFile.setNumGlobals(0); } - delete d(); + d()->destructor(d()); } void JSGlobalObject::init(JSObject* thisValue) @@ -455,4 +455,9 @@ void* JSGlobalObject::operator new(size_t size, JSGlobalData* globalData) #endif } +void JSGlobalObject::destroyJSGlobalObjectData(void* jsGlobalObjectData) +{ + delete static_cast<JSGlobalObjectData*>(jsGlobalObjectData); +} + } // namespace JSC |