diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 09:36:20 +0200 |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 09:36:20 +0200 |
| commit | 898cba2245b6fafa3820b44203442fedd9f7ed73 (patch) | |
| tree | c7545af2a15396c7c5d79612d7073de9b4274d43 /src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp | |
| parent | 6dade01b24f3fd314cb6ec9c2979348e78740a52 (diff) | |
| parent | 028655065de7f989a35b63bcab583767aba9c048 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp b/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp index a1c43764d..2abe5b053 100644 --- a/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp +++ b/src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp @@ -110,9 +110,9 @@ ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode) RefPtr<Frame> protect = m_frame; - m_windowShell->window()->globalData()->timeoutChecker.start(); + m_windowShell->window()->globalData()->timeoutChecker->start(); Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), jsSourceCode, m_windowShell); - m_windowShell->window()->globalData()->timeoutChecker.stop(); + m_windowShell->window()->globalData()->timeoutChecker->stop(); // Evaluating the JavaScript could cause the frame to be deallocated // so we start the keep alive timer here. |