Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2633253002: Split content script injections into multiple tasks (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698