diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
| commit | aa9cf406d62004519ad54596e1c391f9a6439210 (patch) | |
| tree | dd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/generated/JSConsole.cpp | |
| parent | 987aec28b950e1c9817a20a9dd71afc071cd93ea (diff) | |
| parent | 56b6a5924008ab5cdbae36e9662eddba923acd5e (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/generated/JSConsole.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/generated/JSConsole.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp index 2b223a208..110c7e1bf 100644 --- a/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp +++ b/src/3rdparty/webkit/WebCore/generated/JSConsole.cpp @@ -91,8 +91,8 @@ bool JSConsolePrototype::getOwnPropertySlot(ExecState* exec, const Identifier& p const ClassInfo JSConsole::s_info = { "Console", 0, &JSConsoleTable, 0 }; -JSConsole::JSConsole(PassRefPtr<Structure> structure, PassRefPtr<Console> impl) - : DOMObject(structure) +JSConsole::JSConsole(PassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<Console> impl) + : DOMObjectWithGlobalPointer(structure, globalObject) , m_impl(impl) { } @@ -114,7 +114,8 @@ bool JSConsole::getOwnPropertySlot(ExecState* exec, const Identifier& propertyNa JSValue jsConsoleProfiles(ExecState* exec, const Identifier&, const PropertySlot& slot) { - return static_cast<JSConsole*>(asObject(slot.slotBase()))->profiles(exec); + JSConsole* castedThis = static_cast<JSConsole*>(asObject(slot.slotBase())); + return castedThis->profiles(exec); } JSValue JSC_HOST_CALL jsConsolePrototypeFunctionDebug(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args) @@ -328,9 +329,9 @@ JSValue JSC_HOST_CALL jsConsolePrototypeFunctionGroupEnd(ExecState* exec, JSObje return jsUndefined(); } -JSC::JSValue toJS(JSC::ExecState* exec, Console* object) +JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Console* object) { - return getDOMObjectWrapper<JSConsole>(exec, object); + return getDOMObjectWrapper<JSConsole>(exec, globalObject, object); } Console* toConsole(JSC::JSValue value) { |