Revert "Move CanExecuteScripts() to V8ScriptRunner::CompileAndRunScript()"

This reverts commit 3d519f44.

Reason for revert:
This caused a 15% build time increase (see second bug).

Original change's description:
> Move CanExecuteScripts() to V8ScriptRunner::CompileAndRunScript()
>
> To unify how CanExecuteScripts() is checked across
> classic script evaluation code paths.
>
> This CL doesn't change the behavior.
>
> Bug: 1111134
> Change-Id: If95a32043c52767eda05f16f9630edee26c5e75f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544938
> Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
> Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#832649}

TBR=yukishiino@chromium.org,hiroshige@chromium.org,dom@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1111134, 1155843
Change-Id: I7531522623086a7e9903364288a557341208d84b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576236Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834014}

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

@@ -153,8 +153,7 @@ void ScheduledAction::Execute(ExecutionContext* context) {
         script_state_->GetContext(),
         ScriptSourceCode(code_,
                          ScriptSourceLocationType::kEvalForScheduledAction),
-        KURL(), SanitizeScriptErrors::kDoNotSanitize, ScriptFetchOptions(),
-        ScriptController::kDoNotExecuteScriptWhenScriptsDisabled);
+        KURL(), SanitizeScriptErrors::kDoNotSanitize);
   } else {
     WorkerGlobalScope* worker = To<WorkerGlobalScope>(context);
     DCHECK(worker->GetThread()->IsCurrentThread());

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

@@ -87,17 +87,16 @@ v8::Local<v8::Value> ScriptController::ExecuteScriptAndReturnValue(
     const ScriptSourceCode& source,
     const KURL& base_url,
     SanitizeScriptErrors sanitize_script_errors,
-    const ScriptFetchOptions& fetch_options,
-    ScriptController::ExecuteScriptPolicy policy) {
-  ScriptEvaluationResult result = V8ScriptRunner::CompileAndRunScript(
-      GetIsolate(), ScriptState::From(context), window_.Get(), source, base_url,
-      sanitize_script_errors, fetch_options, policy,
-      V8ScriptRunner::RethrowErrorsOption::DoNotRethrow());
+    const ScriptFetchOptions& fetch_options) {
+    ScriptEvaluationResult result = V8ScriptRunner::CompileAndRunScript(
+        GetIsolate(), ScriptState::From(context), window_.Get(), source,
+        base_url, sanitize_script_errors, fetch_options,
+        V8ScriptRunner::RethrowErrorsOption::DoNotRethrow());
 
-  if (result.GetResultType() == ScriptEvaluationResult::ResultType::kSuccess)
-    return result.GetSuccessValue();
+    if (result.GetResultType() == ScriptEvaluationResult::ResultType::kSuccess)
+      return result.GetSuccessValue();
 
-  return v8::Local<v8::Value>();
+    return v8::Local<v8::Value>();
 }
 
 TextPosition ScriptController::EventHandlerPosition() const {
@@ -275,6 +274,10 @@ v8::Local<v8::Value> ScriptController::EvaluateScriptInMainWorld(
     SanitizeScriptErrors sanitize_script_errors,
     const ScriptFetchOptions& fetch_options,
     ExecuteScriptPolicy policy) {
+  if (!CanExecuteScript(policy)) {
+    return v8::Local<v8::Value>();
+  }
+
   // |script_state->GetContext()| should be initialized already due to the
   // WindowProxy() call inside ToScriptStateForMainWorld().
   ScriptState* script_state = ToScriptStateForMainWorld(window_->GetFrame());
@@ -285,7 +288,7 @@ v8::Local<v8::Value> ScriptController::EvaluateScriptInMainWorld(
 
   return ExecuteScriptAndReturnValue(script_state->GetContext(), source_code,
                                      base_url, sanitize_script_errors,
-                                     fetch_options, policy);
+                                     fetch_options);
 }
 
 v8::Local<v8::Value> ScriptController::EvaluateMethodInMainWorld(
@@ -352,10 +355,8 @@ v8::Local<v8::Value> ScriptController::ExecuteScriptInIsolatedWorld(
   // WindowProxy() inside ToScriptState() above. Add a helper which makes that
   // obvious?
 
-  return ExecuteScriptAndReturnValue(
-      script_state->GetContext(), source, base_url, sanitize_script_errors,
-      ScriptFetchOptions(),
-      ScriptController::kExecuteScriptWhenScriptsDisabled);
+  return ExecuteScriptAndReturnValue(script_state->GetContext(), source,
+                                     base_url, sanitize_script_errors);
 }
 
 scoped_refptr<DOMWrapperWorld>

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

@@ -61,8 +61,6 @@ class SecurityOrigin;
 class CORE_EXPORT ScriptController final
     : public GarbageCollected<ScriptController> {
  public:
-  // TODO(crbug.com/1111134): Move this enum to V8ScriptRunner and remove
-  // #include "script_controller.h" from v8_script_runner.h.
   enum ExecuteScriptPolicy {
     kExecuteScriptWhenScriptsDisabled,
     kDoNotExecuteScriptWhenScriptsDisabled
@@ -84,8 +82,7 @@ class CORE_EXPORT ScriptController final
       const ScriptSourceCode&,
       const KURL& base_url,
       SanitizeScriptErrors,
-      const ScriptFetchOptions&,
-      ScriptController::ExecuteScriptPolicy);
+      const ScriptFetchOptions& = ScriptFetchOptions());
 
   v8::Local<v8::Value> EvaluateMethodInMainWorld(
       v8::Local<v8::Function> function,

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

@@ -375,24 +375,13 @@ ScriptEvaluationResult V8ScriptRunner::CompileAndRunScript(
     const KURL& base_url,
     SanitizeScriptErrors sanitize_script_errors,
     const ScriptFetchOptions& fetch_options,
-    ScriptController::ExecuteScriptPolicy policy,
     RethrowErrorsOption rethrow_errors) {
   DCHECK_EQ(isolate, script_state->GetIsolate());
 
-  if (policy == ScriptController::kDoNotExecuteScriptWhenScriptsDisabled &&
-      !execution_context->CanExecuteScripts(kAboutToExecuteScript)) {
-    return ScriptEvaluationResult::FromClassicNotRun();
-  }
+  v8::Context::Scope scope(script_state->GetContext());
 
   LocalDOMWindow* window = DynamicTo<LocalDOMWindow>(execution_context);
   LocalFrame* frame = window ? window->GetFrame() : nullptr;
-
-  if (window && window->document()->IsInitialEmptyDocument()) {
-    window->GetFrame()->Loader().DidAccessInitialDocument();
-  }
-
-  v8::Context::Scope scope(script_state->GetContext());
-
   TRACE_EVENT1("devtools.timeline", "EvaluateScript", "data",
                inspector_evaluate_script_event::Data(
                    frame, source.Url().GetString(), source.StartPosition()));

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

@@ -27,7 +27,6 @@
 #define THIRD_PARTY_BLINK_RENDERER_BINDINGS_CORE_V8_V8_SCRIPT_RUNNER_H_
 
 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
-#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
@@ -127,7 +126,6 @@ class CORE_EXPORT V8ScriptRunner final {
       const KURL&,
       SanitizeScriptErrors,
       const ScriptFetchOptions&,
-      ScriptController::ExecuteScriptPolicy,
       RethrowErrorsOption);
   static v8::MaybeLocal<v8::Value> CompileAndRunInternalScript(
       v8::Isolate*,

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

@@ -317,6 +317,9 @@ ScriptEvaluationResult WorkerOrWorkletScriptController::EvaluateAndReturnValue(
     const ScriptSourceCode& source_code,
     SanitizeScriptErrors sanitize_script_errors,
     V8ScriptRunner::RethrowErrorsOption rethrow_errors) {
+  if (IsExecutionForbidden())
+    return ScriptEvaluationResult::FromClassicNotRun();
+
   DCHECK(IsContextInitialized());
   DCHECK(is_ready_to_evaluate_);
 
@@ -329,9 +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(),
-      ScriptController::kDoNotExecuteScriptWhenScriptsDisabled,
-      std::move(rethrow_errors));
+      sanitize_script_errors, ScriptFetchOptions(), std::move(rethrow_errors));
 
   if (result.GetResultType() == ScriptEvaluationResult::ResultType::kAborted)
     ForbidExecution();

third_party/blink/renderer/core/editing/selection_modifier_test.cc

@@ -8,6 +8,7 @@
 #include "third_party/blink/renderer/core/editing/editor.h"
 #include "third_party/blink/renderer/core/editing/testing/editing_test_base.h"
 #include "third_party/blink/renderer/core/editing/visible_position.h"
+#include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
 
 namespace blink {