Split content script injections into multiple tasks

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 736 matching lines @@
   return frame()->script().executeScriptInMainWorldAndReturnValue(
       ScriptSourceCode(source.code, source.url, position));
 }
 
 void WebLocalFrameImpl::requestExecuteScriptAndReturnValue(
     const WebScriptSource& source,
     bool userGesture,
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
 
-  SuspendableScriptExecutor::createAndRun(
+  SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
       frame(), 0, createSourcesVector(&source, 1), userGesture, callback);
+  executor->run();
 }
 
 void WebLocalFrameImpl::requestExecuteV8Function(
     v8::Local<v8::Context> context,
     v8::Local<v8::Function> function,
     v8::Local<v8::Value> receiver,
     int argc,
     v8::Local<v8::Value> argv[],
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
@@ skipping 27 matching lines @@
     v8::HandleScope handleScope(toIsolate(frame()));
     frame()->script().executeScriptInIsolatedWorld(worldID, sources, 0);
   }
 }
 
 void WebLocalFrameImpl::requestExecuteScriptInIsolatedWorld(
     int worldID,
     const WebScriptSource* sourcesIn,
     unsigned numSources,
     bool userGesture,
+    ScriptExecutionType option,
     WebScriptExecutionCallback* callback) {
   DCHECK(frame());
   CHECK_GT(worldID, 0);
   CHECK_LT(worldID, DOMWrapperWorld::EmbedderWorldIdLimit);
 
-  SuspendableScriptExecutor::createAndRun(
+  SuspendableScriptExecutor* executor = SuspendableScriptExecutor::create(
       frame(), worldID, createSourcesVector(sourcesIn, numSources), userGesture,
       callback);
+  switch (option) {
+    case AsynchronousBlockingOnload:
+      executor->runAsync(SuspendableScriptExecutor::OnloadBlocking);
+      break;
+    case Asynchronous:
+      executor->runAsync(SuspendableScriptExecutor::NonBlocking);
+      break;
+    case Synchronous:
+      executor->run();
+      break;
+  }
 }
 
 // TODO(bashi): Consider returning MaybeLocal.
 v8::Local<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(
     v8::Local<v8::Function> function,
     v8::Local<v8::Value> receiver,
     int argc,
     v8::Local<v8::Value> argv[]) {
   DCHECK(frame());
   v8::Local<v8::Value> result;
@@ skipping 1639 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink