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

Unified Diff: Source/bindings/core/v8/WorkerScriptController.cpp

Issue 929953002: CachedMetadata support for ServiceWorker script. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated tkent's comment Created 5 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: Source/bindings/core/v8/WorkerScriptController.cpp
diff --git a/Source/bindings/core/v8/WorkerScriptController.cpp b/Source/bindings/core/v8/WorkerScriptController.cpp
index bbd4bf7912058bcf822ab14ef5ff049894a51b5e..4526752fa6332be7c8890e2fdfe24ef0f8e49371 100644
--- a/Source/bindings/core/v8/WorkerScriptController.cpp
+++ b/Source/bindings/core/v8/WorkerScriptController.cpp
@@ -196,7 +196,7 @@ bool WorkerScriptController::initializeContextIfNeeded()
return true;
}
-ScriptValue WorkerScriptController::evaluate(const String& script, const String& fileName, const TextPosition& scriptStartPosition)
+ScriptValue WorkerScriptController::evaluate(const String& script, const String& fileName, const TextPosition& scriptStartPosition, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
{
if (!initializeContextIfNeeded())
return ScriptValue();
@@ -212,7 +212,7 @@ ScriptValue WorkerScriptController::evaluate(const String& script, const String&
v8::TryCatch block;
v8::Handle<v8::String> scriptString = v8String(m_isolate, script);
- v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(scriptString, fileName, scriptStartPosition, 0, 0, m_isolate);
+ v8::Handle<v8::Script> compiledScript = V8ScriptRunner::compileScript(scriptString, fileName, scriptStartPosition, m_isolate, nullptr, nullptr, cacheHandler, SharableCrossOrigin, v8CacheOptions);
v8::Local<v8::Value> result = V8ScriptRunner::runCompiledScript(m_isolate, compiledScript, &m_workerGlobalScope);
if (!block.CanContinue()) {
@@ -240,13 +240,13 @@ ScriptValue WorkerScriptController::evaluate(const String& script, const String&
return ScriptValue(m_scriptState.get(), result);
}
-bool WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, RefPtrWillBeRawPtr<ErrorEvent>* errorEvent)
+bool WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, RefPtrWillBeRawPtr<ErrorEvent>* errorEvent, CachedMetadataHandler* cacheHandler, V8CacheOptions v8CacheOptions)
{
if (isExecutionForbidden())
return false;
WorkerGlobalScopeExecutionState state(this);
- evaluate(sourceCode.source(), sourceCode.url().string(), sourceCode.startPosition());
+ evaluate(sourceCode.source(), sourceCode.url().string(), sourceCode.startPosition(), cacheHandler, v8CacheOptions);
if (state.hadException) {
if (errorEvent) {
if (state.m_errorEventFromImportedScript) {
« no previous file with comments | « Source/bindings/core/v8/WorkerScriptController.h ('k') | Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698