| Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| index 859ed9967d4c420907b7b2fb2ce70167129e7875..bcf9ecac3476016a3d280364a9dc8a9d8a307958 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| @@ -748,8 +748,9 @@ void WebLocalFrameImpl::requestExecuteScriptAndReturnValue(
|
| WebScriptExecutionCallback* callback) {
|
| DCHECK(frame());
|
|
|
| - SuspendableScriptExecutor::createAndRun(
|
| + SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
|
| frame(), 0, createSourcesVector(&source, 1), userGesture, callback);
|
| + executor->run();
|
| }
|
|
|
| void WebLocalFrameImpl::requestExecuteV8Function(
|
| @@ -797,14 +798,26 @@ void WebLocalFrameImpl::requestExecuteScriptInIsolatedWorld(
|
| const WebScriptSource* sourcesIn,
|
| unsigned numSources,
|
| bool userGesture,
|
| + ScriptExecutionType option,
|
| WebScriptExecutionCallback* callback) {
|
| DCHECK(frame());
|
| CHECK_GT(worldID, 0);
|
| CHECK_LT(worldID, EmbedderWorldIdLimit);
|
|
|
| - SuspendableScriptExecutor::createAndRun(
|
| + SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
|
| frame(), worldID, createSourcesVector(sourcesIn, numSources), userGesture,
|
| callback);
|
| + switch (option) {
|
| + case AsyncBlockingOnload:
|
| + executor->runAsync(true);
|
| + break;
|
| + case Asynchronous:
|
| + executor->runAsync(false);
|
| + break;
|
| + case Synchronous:
|
| + executor->run();
|
| + break;
|
| + }
|
| }
|
|
|
| // TODO(bashi): Consider returning MaybeLocal.
|
|
|