2009-04-10 Sam Weinig <sam@webkit.org>

        Reviewed by Darin Adler.

        Add back the keepAlive timer for after the script execution to
        protect the callers of evaluate, as was part of the original intent
        of timer.

        * bindings/js/ScriptController.cpp:
        (WebCore::ScriptController::evaluate):
        * page/mac/FrameMac.mm:



git-svn-id: svn://svn.chromium.org/blink/trunk@42417 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2009-04-10  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Add back the keepAlive timer for after the script execution to
+        protect the callers of evaluate, as was part of the original intent
+        of timer.
+
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::evaluate):
+        * page/mac/FrameMac.mm:
+
 2009-04-10  Chris Marrin  <cmarrin@apple.com>
 
         Reviewed by Simon Fraser.

third_party/WebKit/WebCore/bindings/js/ScriptController.cpp

@@ -102,6 +102,10 @@ ScriptValue ScriptController::evaluate(const ScriptSourceCode& sourceCode)
     Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), jsSourceCode, m_windowShell);
     m_windowShell->window()->globalData()->timeoutChecker.stop();
 
+    // Evaluating the JavaScript could cause the frame to be deallocated
+    // so we start the keep alive timer here.
+    m_frame->keepAlive();
+
     if (comp.complType() == Normal || comp.complType() == ReturnValue) {
         m_sourceURL = savedSourceURL;
         return comp.value();