Split content script injections into multiple tasks

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

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 6b5eab5487069912ed95cfe3737178a0727c0320..07e3f3e7016b05c4bb851d25080bee328f17e3af 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -749,8 +749,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(
@@ -798,14 +799,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.