diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp index 17498cb0ad..87f28df153 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp @@ -48,35 +48,6 @@ bool url_matches_about_blank(AK::URL const& url) && url.host().has(); } -// FIXME: This is an outdated older version of "determining the origin" and should be removed. -// https://html.spec.whatwg.org/multipage/browsers.html#determining-the-origin -HTML::Origin determine_the_origin(BrowsingContext const& browsing_context, Optional url, SandboxingFlagSet sandbox_flags, Optional invocation_origin) -{ - // 1. If sandboxFlags has its sandboxed origin browsing context flag set, then return a new opaque origin. - if (has_flag(sandbox_flags, SandboxingFlagSet::SandboxedOrigin)) { - return HTML::Origin {}; - } - - // 2. If url is null, then return a new opaque origin. - if (!url.has_value()) { - return HTML::Origin {}; - } - - // 3. If invocationOrigin is non-null and url matches about:blank, then return invocationOrigin. - if (invocation_origin.has_value() && url_matches_about_blank(*url)) { - return invocation_origin.value(); - } - - // 4. If url is about:srcdoc, then return the origin of browsingContext's container document. - if (url == AK::URL("about:srcdoc")) { - VERIFY(browsing_context.container_document()); - return browsing_context.container_document()->origin(); - } - - // 5. Return url's origin. - return URL::url_origin(*url); -} - // https://html.spec.whatwg.org/multipage/document-sequences.html#determining-the-origin HTML::Origin determine_the_origin(AK::URL const& url, SandboxingFlagSet sandbox_flags, Optional source_origin, Optional container_origin) { diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContext.h b/Userland/Libraries/LibWeb/HTML/BrowsingContext.h index 39d92bd4f8..467f0606c7 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContext.h +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContext.h @@ -286,9 +286,6 @@ private: bool m_has_been_discarded { false }; }; -// FIXME: Remove this once everything is switched to the new overload. -HTML::Origin determine_the_origin(BrowsingContext const& browsing_context, Optional url, SandboxingFlagSet sandbox_flags, Optional invocation_origin); - HTML::Origin determine_the_origin(AK::URL const& url, SandboxingFlagSet sandbox_flags, Optional source_origin, Optional container_origin); SandboxingFlagSet determine_the_creation_sandboxing_flags(BrowsingContext const&, JS::GCPtr embedder); diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp index aa70fa8787..a3b8bb3ba5 100644 --- a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp @@ -306,7 +306,7 @@ void FrameLoader::resource_did_load() // (Part of https://html.spec.whatwg.org/#navigating-across-documents) // 3. Let responseOrigin be the result of determining the origin given browsingContext, resource's url, finalSandboxFlags, and incumbentNavigationOrigin. // FIXME: Pass incumbentNavigationOrigin - auto response_origin = HTML::determine_the_origin(browsing_context(), url, final_sandboxing_flag_set, {}); + // auto response_origin = HTML::determine_the_origin(browsing_context(), url, final_sandboxing_flag_set, {}); auto& vm = Bindings::main_thread_vm(); auto response = Fetch::Infrastructure::Response::create(vm); @@ -315,7 +315,8 @@ void FrameLoader::resource_did_load() .id = {}, .request = nullptr, .response = response, - .origin = move(response_origin), + .origin = {}, + // .origin = move(response_origin), .policy_container = HTML::PolicyContainer {}, .final_sandboxing_flag_set = final_sandboxing_flag_set, .cross_origin_opener_policy = HTML::CrossOriginOpenerPolicy {},