diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-30 09:22:27 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-30 09:22:27 (GMT) |
| commit | 4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b (patch) | |
| tree | 102f342b147eb0f2d3ef3e763d37224a5e4e2fbb /src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp | |
| parent | 86d6bbd43601404bc13ee75ea5143add7947a563 (diff) | |
| parent | 8aaeb297d8d0dc406c0df9ae35558c9b51e9e6a3 (diff) | |
| download | Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.zip Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.tar.gz Qt-4d0bc04cc2aa6fa6a5b18d53bdfcc8b02708d82b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp index 6b60c21..5d078ea 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSJavaScriptCallFrame.cpp @@ -76,9 +76,9 @@ static const HashTable JSJavaScriptCallFramePrototypeTable = const ClassInfo JSJavaScriptCallFramePrototype::s_info = { "JavaScriptCallFramePrototype", 0, &JSJavaScriptCallFramePrototypeTable, 0 }; -JSObject* JSJavaScriptCallFramePrototype::self(ExecState* exec) +JSObject* JSJavaScriptCallFramePrototype::self(ExecState* exec, JSGlobalObject* globalObject) { - return getDOMPrototype<JSJavaScriptCallFrame>(exec); + return getDOMPrototype<JSJavaScriptCallFrame>(exec, globalObject); } bool JSJavaScriptCallFramePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) @@ -100,9 +100,9 @@ JSJavaScriptCallFrame::~JSJavaScriptCallFrame() } -JSObject* JSJavaScriptCallFrame::createPrototype(ExecState* exec) +JSObject* JSJavaScriptCallFrame::createPrototype(ExecState* exec, JSGlobalObject* globalObject) { - return new (exec) JSJavaScriptCallFramePrototype(JSJavaScriptCallFramePrototype::createStructure(exec->lexicalGlobalObject()->objectPrototype())); + return new (exec) JSJavaScriptCallFramePrototype(JSJavaScriptCallFramePrototype::createStructure(globalObject->objectPrototype())); } bool JSJavaScriptCallFrame::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) |