diff --git a/Libraries/LibWeb/Bindings/MainThreadVM.cpp b/Libraries/LibWeb/Bindings/MainThreadVM.cpp index c98b4860660..0270ceba9a2 100644 --- a/Libraries/LibWeb/Bindings/MainThreadVM.cpp +++ b/Libraries/LibWeb/Bindings/MainThreadVM.cpp @@ -556,7 +556,7 @@ ErrorOr initialize_main_thread_vm(HTML::EventLoop::Type type) auto& settings_object = HTML::principal_realm_settings_object(HTML::principal_realm(*module_map_realm)); // 12. 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 = HTML::get_descendant_script_fetch_options(original_fetch_options, url.value(), settings_object); // 13. Let destination be "script". auto destination = Fetch::Infrastructure::Request::Destination::Script; diff --git a/Libraries/LibWeb/HTML/HTMLScriptElement.cpp b/Libraries/LibWeb/HTML/HTMLScriptElement.cpp index 9fe04a07657..a3d17e3bfb5 100644 --- a/Libraries/LibWeb/HTML/HTMLScriptElement.cpp +++ b/Libraries/LibWeb/HTML/HTMLScriptElement.cpp @@ -419,7 +419,7 @@ void HTMLScriptElement::prepare_script() else if (m_script_type == ScriptType::Module) { // If el does not have an integrity attribute, then set options's integrity metadata to the result of resolving a module integrity metadata with url and settings object. if (!has_attribute(HTML::AttributeNames::integrity)) - options.integrity_metadata = MUST(resolve_a_module_integrity_metadata(url, settings_object)); + options.integrity_metadata = resolve_a_module_integrity_metadata(url, settings_object); // Fetch an external module script graph given url, settings object, options, and onComplete. fetch_external_module_script_graph(realm(), url, settings_object, options, on_complete); diff --git a/Libraries/LibWeb/HTML/Scripting/Fetching.cpp b/Libraries/LibWeb/HTML/Scripting/Fetching.cpp index edb827c51ec..b259a1c79eb 100644 --- a/Libraries/LibWeb/HTML/Scripting/Fetching.cpp +++ b/Libraries/LibWeb/HTML/Scripting/Fetching.cpp @@ -287,7 +287,7 @@ static void set_up_module_script_request(Fetch::Infrastructure::Request& request } // https://html.spec.whatwg.org/multipage/webappapis.html#get-the-descendant-script-fetch-options -WebIDL::ExceptionOr get_descendant_script_fetch_options(ScriptFetchOptions const& original_options, URL::URL const& url, EnvironmentSettingsObject& settings_object) +ScriptFetchOptions get_descendant_script_fetch_options(ScriptFetchOptions const& original_options, URL::URL const& url, EnvironmentSettingsObject& settings_object) { // 1. Let newOptions be a copy of originalOptions. auto new_options = original_options; @@ -297,7 +297,7 @@ WebIDL::ExceptionOr get_descendant_script_fetch_options(Scri // 3. If settingsObject's global object is a Window object, then set integrity to the result of resolving a module integrity metadata with url and settingsObject. if (is(settings_object.global_object())) - integrity = TRY(resolve_a_module_integrity_metadata(url, settings_object)); + integrity = resolve_a_module_integrity_metadata(url, settings_object); // 4. Set newOptions's integrity metadata to integrity. new_options.integrity_metadata = integrity; @@ -310,7 +310,7 @@ WebIDL::ExceptionOr get_descendant_script_fetch_options(Scri } // https://html.spec.whatwg.org/multipage/webappapis.html#resolving-a-module-integrity-metadata -WebIDL::ExceptionOr resolve_a_module_integrity_metadata(const URL::URL& url, EnvironmentSettingsObject& settings_object) +String resolve_a_module_integrity_metadata(const URL::URL& url, EnvironmentSettingsObject& settings_object) { // 1. Assert: settingsObject's global object is a Window object. VERIFY(is(settings_object.global_object())); diff --git a/Libraries/LibWeb/HTML/Scripting/Fetching.h b/Libraries/LibWeb/HTML/Scripting/Fetching.h index bb225f57737..d972ff3534d 100644 --- a/Libraries/LibWeb/HTML/Scripting/Fetching.h +++ b/Libraries/LibWeb/HTML/Scripting/Fetching.h @@ -86,8 +86,8 @@ ByteString module_type_from_module_request(JS::ModuleRequest const&); WebIDL::ExceptionOr resolve_module_specifier(Optional referring_script, ByteString const& specifier); WebIDL::ExceptionOr> resolve_imports_match(ByteString const& normalized_specifier, Optional as_url, ModuleSpecifierMap const&); Optional resolve_url_like_module_specifier(ByteString const& specifier, URL::URL const& base_url); -WebIDL::ExceptionOr get_descendant_script_fetch_options(ScriptFetchOptions const& original_options, URL::URL const& url, EnvironmentSettingsObject& settings_object); -WebIDL::ExceptionOr resolve_a_module_integrity_metadata(URL::URL const& url, EnvironmentSettingsObject& settings_object); +ScriptFetchOptions get_descendant_script_fetch_options(ScriptFetchOptions const& original_options, URL::URL const& url, EnvironmentSettingsObject& settings_object); +String resolve_a_module_integrity_metadata(URL::URL const& url, EnvironmentSettingsObject& settings_object); WebIDL::ExceptionOr fetch_classic_script(GC::Ref, URL::URL const&, EnvironmentSettingsObject& settings_object, ScriptFetchOptions options, CORSSettingAttribute cors_setting, String character_encoding, OnFetchScriptComplete on_complete); WebIDL::ExceptionOr fetch_classic_worker_script(URL::URL const&, EnvironmentSettingsObject& fetch_client, Fetch::Infrastructure::Request::Destination, EnvironmentSettingsObject& settings_object, PerformTheFetchHook, OnFetchScriptComplete); WebIDL::ExceptionOr> fetch_a_classic_worker_imported_script(URL::URL const&, HTML::EnvironmentSettingsObject&, PerformTheFetchHook = nullptr);