Changeset 129026 in webkit

Timestamp:

Sep 19, 2012 11:52:18 AM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Remove WorkerContextExecutionProxy::runScript()
​https://bugs.webkit.org/show_bug.cgi?id=97060

Reviewed by Adam Barth.

To kill WorkerContextExecutionProxy, this patch removes
WorkerContextExecutionProxy::runScript() by replacing it
with ScriptRunner::runCompiledScript().

For the replacement, this patch moves TryCatch logic in
runCompiledScript() to the caller side. The reason why
we have to avoid nesting TryCatches is a V8 bug:
​http://code.google.com/p/v8/issues/detail?id=2166

No tests. No change in behavior.

• bindings/v8/ScriptController.cpp:

(WebCore::ScriptController::compileAndRunScript):

• bindings/v8/ScriptRunner.cpp:

(WebCore::ScriptRunner::runCompiledScript):

• bindings/v8/WorkerContextExecutionProxy.cpp:

(WebCore::WorkerContextExecutionProxy::evaluate):

• bindings/v8/WorkerContextExecutionProxy.h:

(WorkerContextExecutionProxy):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (1 diff)
• bindings/v8/ScriptRunner.cpp (modified) (2 diffs)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (3 diffs)
• bindings/v8/WorkerContextExecutionProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-19  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Remove WorkerContextExecutionProxy::runScript()
+        https://bugs.webkit.org/show_bug.cgi?id=97060
+
+        Reviewed by Adam Barth.
+
+        To kill WorkerContextExecutionProxy, this patch removes
+        WorkerContextExecutionProxy::runScript() by replacing it
+        with ScriptRunner::runCompiledScript().
+
+        For the replacement, this patch moves TryCatch logic in
+        runCompiledScript() to the caller side. The reason why
+        we have to avoid nesting TryCatches is a V8 bug:
+        http://code.google.com/p/v8/issues/detail?id=2166
+
+        No tests. No change in behavior.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::compileAndRunScript):
+        * bindings/v8/ScriptRunner.cpp:
+        (WebCore::ScriptRunner::runCompiledScript):
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::evaluate):
+        * bindings/v8/WorkerContextExecutionProxy.h:
+        (WorkerContextExecutionProxy):
+
 2012-09-19  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebCore/bindings/v8/ScriptController.cpp

@@ -282 +282 @@
         RefPtr<Frame> protect(m_frame);
         result = ScriptRunner::runCompiledScript(script, m_frame->document());
+        ASSERT(!tryCatch.HasCaught() || result.IsEmpty());
     }
 

trunk/Source/WebCore/bindings/v8/ScriptRunner.cpp

@@ -48 +48 @@
     // Run the script and keep track of the current recursion depth.
     v8::Local<v8::Value> result;
-    v8::TryCatch tryCatch;
-    tryCatch.SetVerbose(true);
     {
         V8RecursionScope recursionScope(context);
@@ -57 +55 @@
     if (handleOutOfMemory())
         ASSERT(result.IsEmpty());
-
-    // Handle V8 internal error situation.
-    if (tryCatch.HasCaught()) {
-        ASSERT(result.IsEmpty());
-        return v8::Local<v8::Value>();
-    }
 
     if (result.IsEmpty())

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -39 +39 @@
 #include "Event.h"
 #include "ScriptCallStack.h"
+#include "ScriptRunner.h"
 #include "ScriptSourceCode.h"
 #include "SharedWorker.h"
@@ -224 +225 @@
     v8::Local<v8::String> scriptString = v8ExternalString(script);
     v8::Handle<v8::Script> compiledScript = ScriptSourceCode::compileScript(scriptString, fileName, scriptStartPosition);
-    v8::Local<v8::Value> result = runScript(compiledScript);
+    v8::Local<v8::Value> result = ScriptRunner::runCompiledScript(compiledScript, m_workerContext);
 
     if (!exceptionCatcher.CanContinue()) {
@@ -257 +258 @@
 }
 
-v8::Local<v8::Value> WorkerContextExecutionProxy::runScript(v8::Handle<v8::Script> script)
-{
-    if (script.IsEmpty())
-        return v8::Local<v8::Value>();
-
-    // Compute the source string and prevent against infinite recursion.
-    if (V8RecursionScope::recursionLevel() >= kMaxRecursionDepth) {
-        v8::Local<v8::String> code = v8ExternalString("throw RangeError('Recursion too deep')");
-        script = ScriptSourceCode::compileScript(code, "", TextPosition::minimumPosition());
-    }
-
-    if (handleOutOfMemory())
-        ASSERT(script.IsEmpty());
-
-    if (script.IsEmpty())
-        return v8::Local<v8::Value>();
-
-    // Run the script and keep track of the current recursion depth.
-    v8::Local<v8::Value> result;
-    {
-        V8RecursionScope recursionScope(m_workerContext);
-        result = script->Run();
-    }
-
-    // Handle V8 internal error situation (Out-of-memory).
-    if (result.IsEmpty())
-        return v8::Local<v8::Value>();
-
-    return result;
-}
-
 void WorkerContextExecutionProxy::trackEvent(Event* event)
 {

trunk/Source/WebCore/bindings/v8/WorkerContextExecutionProxy.h

@@ -83 +83 @@
         void dispose();
 
-        // Run an already compiled script.
-        v8::Local<v8::Value> runScript(v8::Handle<v8::Script>);
-
         static bool forgetV8EventObject(Event*);