RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 21:08:12 +00:00
Code Issues Activity Actions

LibWeb: Make load_document()'s NavigationParams non-optional

Browse source 
There's no mention in the spec of this being optional, all the places
that call it always pass a NavigationParams directly, and we're
VERIFYing that it's got a value too!
This commit is contained in:
Sam Atkins 2023-12-11 17:26:59 +00:00 • committed by Andreas Kling
parent f900957d26
commit 8dc8d57418
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibWeb/DOM/DocumentLoading.cpp
View file

@ -257,11 +257,9 @@ static bool is_supported_document_mime_type(StringView mime_type)
}
// https://html.spec.whatwg.org/multipage/browsing-the-web.html#loading-a-document
JS::GCPtr<DOM::Document> load_document(Optional<HTML::NavigationParams> navigation_params)
JS::GCPtr<DOM::Document> load_document(HTML::NavigationParams navigation_params)
{
VERIFY(navigation_params.has_value());
auto extracted_mime_type = navigation_params->response->header_list()->extract_mime_type().release_value_but_fixme_should_propagate_errors();
auto extracted_mime_type = navigation_params.response->header_list()->extract_mime_type().release_value_but_fixme_should_propagate_errors();
if (!extracted_mime_type.has_value())
return nullptr;
@ -269,14 +267,14 @@ JS::GCPtr<DOM::Document> load_document(Optional<HTML::NavigationParams> navigati
if (!is_supported_document_mime_type(mime_type.essence()))
return nullptr;
auto document = DOM::Document::create_and_initialize(DOM::Document::Type::HTML, "text/html"_string, *navigation_params).release_value_but_fixme_should_propagate_errors();
auto document = DOM::Document::create_and_initialize(DOM::Document::Type::HTML, "text/html"_string, navigation_params).release_value_but_fixme_should_propagate_errors();
document->set_content_type(mime_type.essence());
auto& realm = document->realm();
if (navigation_params->response->body()) {
if (navigation_params.response->body()) {
Optional<String> content_encoding = mime_type.parameters().get("charset"sv);
auto process_body = [document, url = navigation_params->response->url().value(), encoding = move(content_encoding)](ByteBuffer bytes) {
auto process_body = [document, url = navigation_params.response->url().value(), encoding = move(content_encoding)](ByteBuffer bytes) {
if (parse_document(*document, bytes, move(encoding)))
return;
document->remove_all_children(true);
@ -290,11 +288,11 @@ JS::GCPtr<DOM::Document> load_document(Optional<HTML::NavigationParams> navigati
dbgln("FIXME: Load html page with an error if read of body failed.");
};
navigation_params->response->body()->fully_read(
realm,
move(process_body),
move(process_body_error),
JS::NonnullGCPtr { realm.global_object() })
navigation_params.response->body()->fully_read(
realm,
move(process_body),
move(process_body_error),
JS::NonnullGCPtr { realm.global_object() })
.release_value_but_fixme_should_propagate_errors();
}