Introduce ExecutionContext::GetV8CacheOptions()

To unify how V8CacheOptions is set across
classic script evaluation code paths.

Bug: 1111134
Change-Id: Ie84d896775951a2eb31bfaa23251c99fe3372ea8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541362Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829907}

third_party/blink/renderer/bindings/core/v8/script_controller.cc

@@ -36,8 +36,6 @@
 #include <utility>
 
 #include "base/callback_helpers.h"
-#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
-#include "third_party/blink/public/web/web_settings.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_evaluation_result.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_source_code.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
@@ -51,7 +49,6 @@
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/frame/local_frame_client.h"
-#include "third_party/blink/renderer/core/frame/settings.h"
 #include "third_party/blink/renderer/core/html/html_plugin_element.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/core/inspector/inspector_trace_events.h"
@@ -91,15 +88,9 @@ v8::Local<v8::Value> ScriptController::ExecuteScriptAndReturnValue(
     const KURL& base_url,
     SanitizeScriptErrors sanitize_script_errors,
     const ScriptFetchOptions& fetch_options) {
-    mojom::blink::V8CacheOptions v8_cache_options =
-        mojom::blink::V8CacheOptions::kDefault;
-    if (const Settings* settings = window_->GetFrame()->GetSettings())
-      v8_cache_options = settings->GetV8CacheOptions();
-
     ScriptEvaluationResult result = V8ScriptRunner::CompileAndRunScript(
         GetIsolate(), ScriptState::From(context), window_.Get(), source,
         base_url, sanitize_script_errors, fetch_options,
-        std::move(v8_cache_options),
         V8ScriptRunner::RethrowErrorsOption::DoNotRethrow());
 
     if (result.GetResultType() == ScriptEvaluationResult::ResultType::kSuccess)

third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc

@@ -377,7 +377,6 @@ ScriptEvaluationResult V8ScriptRunner::CompileAndRunScript(
     const KURL& base_url,
     SanitizeScriptErrors sanitize_script_errors,
     const ScriptFetchOptions& fetch_options,
-    mojom::blink::V8CacheOptions v8_cache_options,
     RethrowErrorsOption rethrow_errors) {
   DCHECK_EQ(isolate, script_state->GetIsolate());
 
@@ -432,7 +431,8 @@ ScriptEvaluationResult V8ScriptRunner::CompileAndRunScript(
     V8CodeCache::ProduceCacheOptions produce_cache_options;
     v8::ScriptCompiler::NoCacheReason no_cache_reason;
     std::tie(compile_options, produce_cache_options, no_cache_reason) =
-        V8CodeCache::GetCompileOptions(v8_cache_options, source);
+        V8CodeCache::GetCompileOptions(execution_context->GetV8CacheOptions(),
+                                       source);
 
     v8::MaybeLocal<v8::Value> maybe_result;
     if (V8ScriptRunner::CompileScript(script_state, source,

third_party/blink/renderer/bindings/core/v8/v8_script_runner.h

@@ -26,7 +26,6 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_V8_SCRIPT_RUNNER_H_
 #define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_V8_SCRIPT_RUNNER_H_
 
-#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
@@ -129,7 +128,6 @@ class CORE_EXPORT V8ScriptRunner final {
       const KURL&,
       SanitizeScriptErrors,
       const ScriptFetchOptions&,
-      mojom::blink::V8CacheOptions,
       RethrowErrorsOption);
   static v8::MaybeLocal<v8::Value> CompileAndRunInternalScript(
       v8::Isolate*,

third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc

@@ -316,7 +316,6 @@ void WorkerOrWorkletScriptController::DisableEvalInternal(
 ScriptEvaluationResult WorkerOrWorkletScriptController::EvaluateAndReturnValue(
     const ScriptSourceCode& source_code,
     SanitizeScriptErrors sanitize_script_errors,
-    mojom::blink::V8CacheOptions v8_cache_options,
     V8ScriptRunner::RethrowErrorsOption rethrow_errors) {
   if (IsExecutionForbidden())
     return ScriptEvaluationResult::FromClassicNotRun();
@@ -333,8 +332,7 @@ ScriptEvaluationResult WorkerOrWorkletScriptController::EvaluateAndReturnValue(
   // TODO(crbug/1114989): Plumb ScriptFetchOptions from ClassicScript.
   ScriptEvaluationResult result = V8ScriptRunner::CompileAndRunScript(
       isolate_, script_state_, global_scope_, source_code, base_url,
-      sanitize_script_errors, ScriptFetchOptions(), v8_cache_options,
-      std::move(rethrow_errors));
+      sanitize_script_errors, ScriptFetchOptions(), std::move(rethrow_errors));
 
   if (result.GetResultType() == ScriptEvaluationResult::ResultType::kAborted)
     ForbidExecution();

third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.h

@@ -32,7 +32,6 @@
 #define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_WORKER_OR_WORKLET_SCRIPT_CONTROLLER_H_
 
 #include "base/macros.h"
-#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/rejected_promises.h"
 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_evaluation_result.h"
@@ -62,7 +61,6 @@ class CORE_EXPORT WorkerOrWorkletScriptController final
   ScriptEvaluationResult EvaluateAndReturnValue(
       const ScriptSourceCode&,
       SanitizeScriptErrors sanitize_script_errors,
-      mojom::blink::V8CacheOptions = mojom::blink::V8CacheOptions::kDefault,
       V8ScriptRunner::RethrowErrorsOption =
           V8ScriptRunner::RethrowErrorsOption::DoNotRethrow());
 

third_party/blink/renderer/core/execution_context/execution_context.h

@@ -42,6 +42,7 @@
 #include "third_party/blink/public/mojom/feature_policy/feature_policy_feature.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/feature_policy/policy_disposition.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/v8_cache_options.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
@@ -212,6 +213,9 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
   virtual bool CanExecuteScripts(ReasonForCallingCanExecuteScripts) {
     return false;
   }
+  virtual mojom::blink::V8CacheOptions GetV8CacheOptions() const {
+    return mojom::blink::V8CacheOptions::kDefault;
+  }
 
   void DispatchErrorEvent(ErrorEvent*, SanitizeScriptErrors);
 

third_party/blink/renderer/core/frame/local_dom_window.cc

@@ -239,6 +239,15 @@ LocalDOMWindow* LocalDOMWindow::From(const ScriptState* script_state) {
   return blink::ToLocalDOMWindow(script_state->GetContext());
 }
 
+mojom::blink::V8CacheOptions LocalDOMWindow::GetV8CacheOptions() const {
+  if (LocalFrame* frame = GetFrame()) {
+    if (const Settings* settings = frame->GetSettings())
+      return settings->GetV8CacheOptions();
+  }
+
+  return mojom::blink::V8CacheOptions::kDefault;
+}
+
 bool LocalDOMWindow::IsContextThread() const {
   return IsMainThread();
 }

third_party/blink/renderer/core/frame/local_dom_window.h

@@ -128,6 +128,8 @@ class CORE_EXPORT LocalDOMWindow final : public DOMWindow,
 
   void ResetWindowAgent(WindowAgent*);
 
+  mojom::blink::V8CacheOptions GetV8CacheOptions() const override;
+
   // Bind Content Security Policy to this window. This will cause the
   // CSP to resolve the 'self' attribute and all policies will then be
   // applied to this document.

third_party/blink/renderer/core/script/classic_script.cc

@@ -58,8 +58,7 @@ bool ClassicScript::RunScriptOnWorkerOrWorklet(
   ScriptState::Scope scope(global_scope.ScriptController()->GetScriptState());
   ScriptEvaluationResult result =
       global_scope.ScriptController()->EvaluateAndReturnValue(
-          GetScriptSourceCode(), sanitize_script_errors_,
-          global_scope.GetV8CacheOptions());
+          GetScriptSourceCode(), sanitize_script_errors_);
   return result.GetResultType() == ScriptEvaluationResult::ResultType::kSuccess;
 }
 

third_party/blink/renderer/core/workers/worker_global_scope.cc

@@ -339,7 +339,7 @@ void WorkerGlobalScope::ImportScriptsInternal(const Vector<String>& urls) {
                          handler,
                          ScriptSourceCode::UsePostRedirectURL() ? response_url
                                                                 : complete_url),
-        sanitize_script_errors, GetV8CacheOptions(),
+        sanitize_script_errors,
         V8ScriptRunner::RethrowErrorsOption::Rethrow(error_message));
 
     // Step 5.2: "If an exception was thrown or if the script was prematurely

third_party/blink/renderer/core/workers/worker_or_worklet_global_scope.h

@@ -140,7 +140,7 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public EventTargetWithInlineData,
   WorkerOrWorkletScriptController* ScriptController() {
     return script_controller_.Get();
   }
-  mojom::blink::V8CacheOptions GetV8CacheOptions() const {
+  mojom::blink::V8CacheOptions GetV8CacheOptions() const override {
     return v8_cache_options_;
   }