Chromium Code Reviews| Index: Source/bindings/core/v8/PrivateScriptRunner.cpp |
| diff --git a/Source/bindings/core/v8/PrivateScriptRunner.cpp b/Source/bindings/core/v8/PrivateScriptRunner.cpp |
| index c3df1604ff9e95f346e4bef86676efdc058b5036..fdb59522cd589bfb00afda695feea10e377e2380 100644 |
| --- a/Source/bindings/core/v8/PrivateScriptRunner.cpp |
| +++ b/Source/bindings/core/v8/PrivateScriptRunner.cpp |
| @@ -59,17 +59,20 @@ static v8::Handle<v8::Value> compileAndRunPrivateScript(v8::Isolate* isolate, St |
| privateScriptControllerObject->Set(v8String(isolate, "import"), v8::FunctionTemplate::New(isolate, importFunction)->GetFunction()); |
| } |
| - v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(v8String(isolate, sourceString), fileName, String(), TextPosition::minimumPosition(), isolate, nullptr, nullptr, nullptr, NotSharableCrossOrigin); |
| - if (block.HasCaught()) { |
| + v8::Local<v8::Script> script; |
| + if (!V8ScriptRunner::compileScript(v8String(isolate, sourceString), fileName, String(), TextPosition::minimumPosition(), isolate, nullptr, nullptr, nullptr, NotSharableCrossOrigin).ToLocal(&script)) { |
| fprintf(stderr, "Private script error: Compile failed. (Class name = %s)\n", scriptClassName.utf8().data()); |
| - dumpV8Message(block.Message()); |
| + if (block.HasCaught()) |
|
haraken
2015/03/13 04:31:16
Just to confirm: When a worker termination is sign
bashi
2015/03/13 05:15:20
I'm not fully confident, but I think you are right
|
| + dumpV8Message(block.Message()); |
| RELEASE_ASSERT_NOT_REACHED(); |
| } |
| - v8::Handle<v8::Value> result = V8ScriptRunner::runCompiledInternalScript(isolate, script); |
| - if (block.HasCaught()) { |
| - fprintf(stderr, "Private script error: installClass() failed. (Class name = %s)\n", scriptClassName.utf8().data()); |
| - dumpV8Message(block.Message()); |
| + v8::Local<v8::Value> result; |
| + if (!V8ScriptRunner::runCompiledInternalScript(isolate, script).ToLocal(&result)) { |
| + if (block.HasCaught()) { |
| + fprintf(stderr, "Private script error: installClass() failed. (Class name = %s)\n", scriptClassName.utf8().data()); |
| + dumpV8Message(block.Message()); |
| + } |
| RELEASE_ASSERT_NOT_REACHED(); |
| } |
| return result; |