diff options
| author | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
| commit | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (patch) | |
| tree | 2302096f06d4629ea62a85317429daa74ce6f02d /src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp | |
| parent | be6357bfa96cdaffa5797fef99e95cac7121e5b3 (diff) | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| download | Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.zip Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.gz Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp b/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp index 45d4e23..f7046e3 100644 --- a/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp +++ b/src/3rdparty/webkit/WebCore/dom/ScriptExecutionContext.cpp @@ -36,6 +36,10 @@ #include <wtf/MainThread.h> #include <wtf/PassRefPtr.h> +#if USE(JSC) +#include "JSDOMWindow.h" +#endif + namespace WebCore { class ProcessMessagesSoonTask : public ScriptExecutionContext::Task { @@ -195,4 +199,20 @@ ScriptExecutionContext::Task::~Task() { } +#if USE(JSC) +JSC::JSGlobalData* ScriptExecutionContext::globalData() +{ + if (isDocument()) + return JSDOMWindow::commonJSGlobalData(); + +#if ENABLE(WORKERS) + if (isWorkerContext()) + return static_cast<WorkerContext*>(this)->script()->globalData(); +#endif + + ASSERT_NOT_REACHED(); + return 0; +} +#endif + } // namespace WebCore |