Use static mapping for Blink::ExecutionContext -> V8::Isolate

Bug: 889542
Change-Id: I59055c2ce9b6af9026ee8284dd3f943cc0d7d179
Reviewed-on: https://chromium-review.googlesource.com/c/1252625
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: Hayato Ito <hayato@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611992}

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

@@ -873,9 +873,15 @@ bool HasCallableIteratorSymbol(v8::Isolate* isolate,
 }
 
 v8::Isolate* ToIsolate(const ExecutionContext* context) {
+  if (!context)
+    return nullptr;
+
+  v8::Isolate* isolate;
   if (context && context->IsDocument())
-    return V8PerIsolateData::MainThreadIsolate();
-  return v8::Isolate::GetCurrent();
+    isolate = V8PerIsolateData::MainThreadIsolate();
+  isolate = v8::Isolate::GetCurrent();
+  DCHECK(context->GetIsolate() == isolate);
+  return context->GetIsolate();
 }
 
 v8::Isolate* ToIsolate(const LocalFrame* frame) {

third_party/blink/renderer/core/dom/document.cc

@@ -597,6 +597,7 @@ Document::Document(const DocumentInit& initializer,
                    DocumentClassFlags document_classes)
     : ContainerNode(nullptr, kCreateDocument),
       TreeScope(*this),
+      ExecutionContext(V8PerIsolateData::MainThreadIsolate()),
       has_nodes_with_placeholder_style_(false),
       evaluate_media_queries_on_style_recalc_(false),
       pending_sheet_layout_(kNoLayoutWithPendingSheets),

third_party/blink/renderer/core/execution_context/execution_context.cc

@@ -45,8 +45,9 @@
 
 namespace blink {
 
-ExecutionContext::ExecutionContext()
-    : circular_sequential_id_(0),
+ExecutionContext::ExecutionContext(v8::Isolate* isolate)
+    : isolate_(isolate),
+      circular_sequential_id_(0),
       in_dispatch_error_event_(false),
       is_context_paused_(false),
       is_context_destroyed_(false),

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

@@ -255,11 +255,15 @@ class CORE_EXPORT ExecutionContext : public ContextLifecycleNotifier,
 
   InterfaceInvalidator* GetInterfaceInvalidator() { return invalidator_.get(); }
 
+  v8::Isolate* GetIsolate() const { return isolate_; }
+
  protected:
-  ExecutionContext();
+  explicit ExecutionContext(v8::Isolate* isolate);
   ~ExecutionContext() override;
 
  private:
+  v8::Isolate* const isolate_;
+
   bool DispatchErrorEventInternal(ErrorEvent*, SanitizeScriptErrors);
 
   unsigned circular_sequential_id_;

third_party/blink/renderer/core/testing/null_execution_context.cc

@@ -13,7 +13,9 @@
 namespace blink {
 
 NullExecutionContext::NullExecutionContext()
-    : tasks_need_pause_(false), is_secure_context_(true) {}
+    : ExecutionContext(v8::Isolate::GetCurrent()),
+      tasks_need_pause_(false),
+      is_secure_context_(true) {}
 
 void NullExecutionContext::SetIsSecureContext(bool is_secure_context) {
   is_secure_context_ = is_secure_context;

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

@@ -28,7 +28,8 @@ WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(
     WorkerClients* worker_clients,
     scoped_refptr<WebWorkerFetchContext> web_worker_fetch_context,
     WorkerReportingProxy& reporting_proxy)
-    : worker_clients_(worker_clients),
+    : ExecutionContext(isolate),
+      worker_clients_(worker_clients),
       web_worker_fetch_context_(std::move(web_worker_fetch_context)),
       script_controller_(
           WorkerOrWorkletScriptController::Create(this, isolate)),