beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb: Update spec comments for HostLoadImportedModule

Browse source
This commit is contained in:
Jamie Mansfield 2024-10-04 00:01:20 +01:00 committed by Andreas Kling
parent d6db6edaf6
commit 797e1d3ee6
Notes: github-actions[bot] 2024-10-04 06:41:14 +00:00 
Author: https://github.com/jamierocks
Commit: https://github.com/LadybirdBrowser/ladybird/commit/797e1d3ee6a
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1620
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp
View file

@ -409,7 +409,7 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
return { "type"sv }; return { "type"sv };
}; };
// 8.1.6.5.3 HostLoadImportedModule(referrer, moduleRequest, loadState, payload), https://html.spec.whatwg.org/multipage/webappapis.html#hostloadimportedmodule // 8.1.6.7.3 HostLoadImportedModule(referrer, moduleRequest, loadState, payload), https://html.spec.whatwg.org/multipage/webappapis.html#hostloadimportedmodule
s_main_thread_vm->host_load_imported_module = [](JS::ImportedModuleReferrer referrer, JS::ModuleRequest const& module_request, JS::GCPtr<JS::GraphLoadingState::HostDefined> load_state, JS::ImportedModulePayload payload) -> void { s_main_thread_vm->host_load_imported_module = [](JS::ImportedModuleReferrer referrer, JS::ModuleRequest const& module_request, JS::GCPtr<JS::GraphLoadingState::HostDefined> load_state, JS::ImportedModulePayload payload) -> void {
auto& vm = *s_main_thread_vm; auto& vm = *s_main_thread_vm;
auto& realm = *vm.current_realm(); auto& realm = *vm.current_realm();
@ -428,7 +428,7 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
// 5. Let fetchReferrer be "client". // 5. Let fetchReferrer be "client".
Fetch::Infrastructure::Request::ReferrerType fetch_referrer = Fetch::Infrastructure::Request::Referrer::Client; Fetch::Infrastructure::Request::ReferrerType fetch_referrer = Fetch::Infrastructure::Request::Referrer::Client;
// 6. If referrer is a Script Record or a Module Record, then: // 6. If referrer is a Script Record or a Cyclic Module Record, then:
if (referrer.has<JS::NonnullGCPtr<JS::Script>>() || referrer.has<JS::NonnullGCPtr<JS::CyclicModule>>()) { if (referrer.has<JS::NonnullGCPtr<JS::Script>>() || referrer.has<JS::NonnullGCPtr<JS::CyclicModule>>()) {
// 1. Set referencingScript to referrer.[[HostDefined]]. // 1. Set referencingScript to referrer.[[HostDefined]].
referencing_script = verify_cast<HTML::Script>(referrer.has<JS::NonnullGCPtr<JS::Script>>() ? *referrer.get<JS::NonnullGCPtr<JS::Script>>()->host_defined() : *referrer.get<JS::NonnullGCPtr<JS::CyclicModule>>()->host_defined()); referencing_script = verify_cast<HTML::Script>(referrer.has<JS::NonnullGCPtr<JS::Script>>() ? *referrer.get<JS::NonnullGCPtr<JS::Script>>()->host_defined() : *referrer.get<JS::NonnullGCPtr<JS::CyclicModule>>()->host_defined());
@ -442,14 +442,16 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
// FIXME: 4. Set originalFetchOptions to referencingScript's fetch options. // FIXME: 4. Set originalFetchOptions to referencingScript's fetch options.
} }
// 7. Disallow further import maps given settingsObject. // FIXME: 7. If referrer is a Cyclic Module Record and moduleRequest is equal to the first element of referrer.[[RequestedModules]], then:
// 8. Disallow further import maps given settingsObject.
settings_object->disallow_further_import_maps(); settings_object->disallow_further_import_maps();
// 8. Let url be the result of resolving a module specifier given referencingScript and moduleRequest.[[Specifier]], // 9. Let url be the result of resolving a module specifier given referencingScript and moduleRequest.[[Specifier]],
// catching any exceptions. If they throw an exception, let resolutionError be the thrown exception. // catching any exceptions. If they throw an exception, let resolutionError be the thrown exception.
auto url = HTML::resolve_module_specifier(referencing_script, module_request.module_specifier); auto url = HTML::resolve_module_specifier(referencing_script, module_request.module_specifier);
// 9. If the previous step threw an exception, then: // 10. If the previous step threw an exception, then:
if (url.is_exception()) { if (url.is_exception()) {
// 1. Let completion be Completion Record { [[Type]]: throw, [[Value]]: resolutionError, [[Target]]: empty }. // 1. Let completion be Completion Record { [[Type]]: throw, [[Value]]: resolutionError, [[Target]]: empty }.
auto completion = dom_exception_to_throw_completion(main_thread_vm(), url.exception()); auto completion = dom_exception_to_throw_completion(main_thread_vm(), url.exception());
@ -462,16 +464,16 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
return; return;
} }
// 10. Let fetchOptions be the result of getting the descendant script fetch options given originalFetchOptions, url, and settingsObject. // 11. Let fetchOptions be the result of getting the descendant script fetch options given originalFetchOptions, url, and settingsObject.
auto fetch_options = MUST(HTML::get_descendant_script_fetch_options(original_fetch_options, url.value(), *settings_object)); auto fetch_options = MUST(HTML::get_descendant_script_fetch_options(original_fetch_options, url.value(), *settings_object));
// 11. Let destination be "script". // 12. Let destination be "script".
auto destination = Fetch::Infrastructure::Request::Destination::Script; auto destination = Fetch::Infrastructure::Request::Destination::Script;
// 12. Let fetchClient be settingsObject. // 13. Let fetchClient be settingsObject.
JS::NonnullGCPtr fetch_client { *settings_object }; JS::NonnullGCPtr fetch_client { *settings_object };
// 13. If loadState is not undefined, then: // 14. If loadState is not undefined, then:
HTML::PerformTheFetchHook perform_fetch; HTML::PerformTheFetchHook perform_fetch;
if (load_state) { if (load_state) {
auto& fetch_context = static_cast<HTML::FetchContext&>(*load_state); auto& fetch_context = static_cast<HTML::FetchContext&>(*load_state);
@ -479,7 +481,7 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
// 1. Set destination to loadState.[[Destination]]. // 1. Set destination to loadState.[[Destination]].
destination = fetch_context.destination; destination = fetch_context.destination;
// 2. Set fetchClient loadState.[[FetchClient]]. // 2. Set fetchClient to loadState.[[FetchClient]].
fetch_client = fetch_context.fetch_client; fetch_client = fetch_context.fetch_client;
// For step 13 // For step 13
@ -518,7 +520,7 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
return completion; return completion;
} }
// 4. Otherwise, set completion to Completion Record { [[Type]]: normal, [[Value]]: result's record, [[Target]]: empty }. // 4. Otherwise, set completion to Completion Record { [[Type]]: normal, [[Value]]: moduleScript's record, [[Target]]: empty }.
else { else {
module = static_cast<HTML::JavaScriptModuleScript&>(*module_script).record(); module = static_cast<HTML::JavaScriptModuleScript&>(*module_script).record();
return JS::ThrowCompletionOr<JS::NonnullGCPtr<JS::Module>>(*module); return JS::ThrowCompletionOr<JS::NonnullGCPtr<JS::Module>>(*module);
@ -539,7 +541,7 @@ ErrorOr<void> initialize_main_thread_vm(HTML::EventLoop::Type type)
vm.pop_execution_context(); vm.pop_execution_context();
}); });
// 14. Fetch a single imported module script given url, fetchClient, destination, fetchOptions, settingsObject, fetchReferrer, // 15. Fetch a single imported module script given url, fetchClient, destination, fetchOptions, settingsObject, fetchReferrer,
// moduleRequest, and onSingleFetchComplete as defined below. // moduleRequest, and onSingleFetchComplete as defined below.
// If loadState is not undefined and loadState.[[PerformFetch]] is not null, pass loadState.[[PerformFetch]] along as well. // If loadState is not undefined and loadState.[[PerformFetch]] is not null, pass loadState.[[PerformFetch]] along as well.
HTML::fetch_single_imported_module_script(realm, url.release_value(), *fetch_client, destination, fetch_options, *settings_object, fetch_referrer, module_request, perform_fetch, on_single_fetch_complete); HTML::fetch_single_imported_module_script(realm, url.release_value(), *fetch_client, destination, fetch_options, *settings_object, fetch_referrer, module_request, perform_fetch, on_single_fetch_complete);