www.fgks.org   »   [go: up one dir, main page]

Skip to content

Commit

Permalink
[v8] Migrate to new HostImportModuleDynamicallyCallback
Browse files Browse the repository at this point in the history
v8::ScriptOrModule is soon going to be deprecated. As a replacement
we provide now a callback with all explicit parameters.

See V8 changes: https://crrev.com/c/3263893

Bug: 1244145
Change-Id: Id6818a29c7b2a358a3b51c50a65a19f32f882928
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3269108
Reviewed-by: Yuki Shiino <yukishiino@chromium.org>
Reviewed-by: Hiroshige Hayashizaki <hiroshige@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#940774}
  • Loading branch information
camillobruni authored and Chromium LUCI CQ committed Nov 11, 2021
1 parent d02b42a commit 2ddf2e0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ static bool WasmInstanceOverride(

static v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
v8::Local<v8::Context> context,
v8::Local<v8::ScriptOrModule> v8_referrer,
v8::Local<v8::Data> v8_host_defined_options,
v8::Local<v8::Value> v8_referrer_resource_url,
v8::Local<v8::String> v8_specifier,
v8::Local<v8::FixedArray> v8_import_assertions) {
ScriptState* script_state = ScriptState::From(context);
Expand Down Expand Up @@ -601,8 +602,6 @@ static v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
}

String specifier = ToCoreStringWithNullCheck(v8_specifier);
v8::Local<v8::Value> v8_referrer_resource_url =
v8_referrer->GetResourceName();
KURL referrer_resource_url;
if (v8_referrer_resource_url->IsString()) {
String referrer_resource_url_str =
Expand All @@ -619,7 +618,7 @@ static v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(

ReferrerScriptInfo referrer_info =
ReferrerScriptInfo::FromV8HostDefinedOptions(
context, v8_referrer->HostDefinedOptions(), referrer_resource_url);
context, v8_host_defined_options, referrer_resource_url);

auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
ScriptPromise promise = resolver->Promise();
Expand Down

0 comments on commit 2ddf2e0

Please sign in to comment.