RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:27:43 +00:00
Code Issues Activity Actions

LibWeb: Attach DOM::Document to its frame before parsing

Browse source 
FrameLoader now begins by constructing a DOM::Document, and then builds
a document tree inside it based on the MIME type. For text/html we pass
control to the HTMLDocumentParser as before.

This gives us access to things like window.alert() during parsing.

Fixes #3973.
This commit is contained in:
Andreas Kling 2020-12-13 17:38:03 +01:00
parent 22c582a887
commit 1eee6716e0
3 changed files with 59 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -52,74 +52,73 @@ FrameLoader::~FrameLoader()
{ {
} }
static RefPtr<DOM::Document> create_markdown_document(const ByteBuffer& data, const URL& url) static bool build_markdown_document(DOM::Document& document, const ByteBuffer& data)
{ {
auto markdown_document = Markdown::Document::parse(data); auto markdown_document = Markdown::Document::parse(data);
if (!markdown_document) if (!markdown_document)
return nullptr; return false;
return HTML::parse_html_document(markdown_document->render_to_html(), url, "utf-8"); HTML::HTMLDocumentParser parser(document, markdown_document->render_to_html(), "utf-8");
parser.run(document.url());
return true;
} }
static RefPtr<DOM::Document> create_text_document(const ByteBuffer& data, const URL& url) static bool build_text_document(DOM::Document& document, const ByteBuffer& data)
{ {
auto document = DOM::Document::create(url); auto html_element = document.create_element("html");
document.append_child(html_element);
auto html_element = document->create_element("html"); auto head_element = document.create_element("head");
document->append_child(html_element);
auto head_element = document->create_element("head");
html_element->append_child(head_element); html_element->append_child(head_element);
auto title_element = document->create_element("title"); auto title_element = document.create_element("title");
head_element->append_child(title_element); head_element->append_child(title_element);
auto title_text = document->create_text_node(url.basename()); auto title_text = document.create_text_node(document.url().basename());
title_element->append_child(title_text); title_element->append_child(title_text);
auto body_element = document->create_element("body"); auto body_element = document.create_element("body");
html_element->append_child(body_element); html_element->append_child(body_element);
auto pre_element = document->create_element("pre"); auto pre_element = document.create_element("pre");
body_element->append_child(pre_element); body_element->append_child(pre_element);
pre_element->append_child(document->create_text_node(String::copy(data))); pre_element->append_child(document.create_text_node(String::copy(data)));
return document; return true;
} }
static RefPtr<DOM::Document> create_image_document(const ByteBuffer& data, const URL& url) static bool build_image_document(DOM::Document& document, const ByteBuffer& data)
{ {
auto document = DOM::Document::create(url);
auto image_decoder = Gfx::ImageDecoder::create(data.data(), data.size()); auto image_decoder = Gfx::ImageDecoder::create(data.data(), data.size());
auto bitmap = image_decoder->bitmap(); auto bitmap = image_decoder->bitmap();
ASSERT(bitmap); if (!bitmap)
return false;
auto html_element = document->create_element("html"); auto html_element = document.create_element("html");
document->append_child(html_element); document.append_child(html_element);
auto head_element = document->create_element("head"); auto head_element = document.create_element("head");
html_element->append_child(head_element); html_element->append_child(head_element);
auto title_element = document->create_element("title"); auto title_element = document.create_element("title");
head_element->append_child(title_element); head_element->append_child(title_element);
auto basename = LexicalPath(url.path()).basename(); auto basename = LexicalPath(document.url().path()).basename();
auto title_text = adopt(*new DOM::Text(document, String::format("%s [%dx%d]", basename.characters(), bitmap->width(), bitmap->height()))); auto title_text = adopt(*new DOM::Text(document, String::formatted("{} [{}x{}]", basename, bitmap->width(), bitmap->height())));
title_element->append_child(title_text); title_element->append_child(title_text);
auto body_element = document->create_element("body"); auto body_element = document.create_element("body");
html_element->append_child(body_element); html_element->append_child(body_element);
auto image_element = document->create_element("img"); auto image_element = document.create_element("img");
image_element->set_attribute(HTML::AttributeNames::src, url.to_string()); image_element->set_attribute(HTML::AttributeNames::src, document.url().to_string());
body_element->append_child(image_element); body_element->append_child(image_element);
return document; return true;
} }
static RefPtr<DOM::Document> create_gemini_document(const ByteBuffer& data, const URL& url) static bool build_gemini_document(DOM::Document& document, const ByteBuffer& data)
{ {
StringView gemini_data { data }; StringView gemini_data { data };
auto gemini_document = Gemini::Document::parse(gemini_data, url); auto gemini_document = Gemini::Document::parse(gemini_data, document.url());
String html_data = gemini_document->render_to_html(); String html_data = gemini_document->render_to_html();
#ifdef GEMINI_DEBUG #ifdef GEMINI_DEBUG
@ -127,29 +126,29 @@ static RefPtr<DOM::Document> create_gemini_document(const ByteBuffer& data, cons
dbgln("Converted to HTML:\n\"\"\"{}\"\"\"", html_data); dbgln("Converted to HTML:\n\"\"\"{}\"\"\"", html_data);
#endif #endif
return HTML::parse_html_document(move(html_data), url, "utf-8"); HTML::HTMLDocumentParser parser(document, html_data, "utf-8");
parser.run(document.url());
return true;
} }
RefPtr<DOM::Document> FrameLoader::create_document_from_mime_type(const ByteBuffer& data, const URL& url, const String& mime_type, const String& encoding) bool FrameLoader::parse_document(DOM::Document& document, const ByteBuffer& data)
{ {
RefPtr<DOM::Document> document; auto& mime_type = document.content_type();
if (mime_type == "text/html" || mime_type == "image/svg+xml") { if (mime_type == "text/html" || mime_type == "image/svg+xml") {
document = HTML::parse_html_document(data, url, encoding); HTML::HTMLDocumentParser parser(document, data, document.encoding());
} else if (mime_type.starts_with("image/")) { parser.run(document.url());
document = create_image_document(data, url); return true;
} else if (mime_type == "text/plain") {
document = create_text_document(data, url);
} else if (mime_type == "text/markdown") {
document = create_markdown_document(data, url);
} else if (mime_type == "text/gemini") {
document = create_gemini_document(data, url);
} }
if (mime_type.starts_with("image/"))
return build_image_document(document, data);
if (mime_type == "text/plain")
return build_text_document(document, data);
if (mime_type == "text/markdown")
return build_markdown_document(document, data);
if (mime_type == "text/gemini")
return build_gemini_document(document, data);
if (document) return false;
document->set_content_type(mime_type);
return document;
} }
bool FrameLoader::load(const LoadRequest& request, Type type) bool FrameLoader::load(const LoadRequest& request, Type type)
@ -257,16 +256,19 @@ void FrameLoader::resource_did_load()
return; return;
} }
dbg() << "I believe this content has MIME type '" << resource()->mime_type() << "', encoding '" << resource()->encoding() << "'"; dbgln("I believe this content has MIME type '{}', , encoding '{}'", resource()->mime_type(), resource()->encoding());
auto document = create_document_from_mime_type(resource()->encoded_data(), url, resource()->mime_type(), resource()->encoding());
if (!document) { auto document = DOM::Document::create();
document->set_url(url);
document->set_content_type(resource()->mime_type());
frame().set_document(document);
if (!parse_document(*document, resource()->encoded_data())) {
load_error_page(url, "Failed to parse content."); load_error_page(url, "Failed to parse content.");
return; return;
} }
frame().set_document(document);
if (!url.fragment().is_empty()) if (!url.fragment().is_empty())
frame().scroll_to_anchor(url.fragment()); frame().scroll_to_anchor(url.fragment());

2
Libraries/LibWeb/Loader/FrameLoader.h
View file

@ -58,7 +58,7 @@ private:
virtual void resource_did_fail() override; virtual void resource_did_fail() override;
void load_error_page(const URL& failed_url, const String& error_message); void load_error_page(const URL& failed_url, const String& error_message);
RefPtr<DOM::Document> create_document_from_mime_type(const ByteBuffer&, const URL&, const String& mime_type, const String& encoding); bool parse_document(DOM::Document&, const ByteBuffer& data);
Frame& m_frame; Frame& m_frame;
}; };

3
Libraries/LibWeb/Page/Frame.cpp
View file

@ -159,6 +159,9 @@ void Frame::scroll_to_anchor(const String& fragment)
} }
} }
// FIXME: This is overly aggressive and should be something more like a "update_layout_if_needed()"
document()->force_layout();
if (!element || !element->layout_node()) if (!element || !element->layout_node())
return; return;