mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 05:28:11 +00:00
LibWeb: Add a FrameLoader class and move PageView's loading logic there
Each Frame now has a FrameLoader which will be responsible for handling loading inside that frame.
This commit is contained in:
Andreas Kling
parent
0cbef87944
commit
075bd75859
7 changed files with 400 additions and 268 deletions
|
|
@ -32,10 +32,8 @@
|
|||
#include <LibGUI/Painter.h>
|
||||
#include <LibGUI/ScrollBar.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGemini/Document.h>
|
||||
#include <LibGfx/ImageDecoder.h>
|
||||
#include <LibJS/Runtime/Value.h>
|
||||
#include <LibMarkdown/Document.h>
|
||||
#include <LibWeb/DOM/Element.h>
|
||||
#include <LibWeb/DOM/ElementFactory.h>
|
||||
#include <LibWeb/DOM/HTMLAnchorElement.h>
|
||||
|
|
@ -46,11 +44,9 @@
|
|||
#include <LibWeb/Frame.h>
|
||||
#include <LibWeb/Layout/LayoutDocument.h>
|
||||
#include <LibWeb/Layout/LayoutNode.h>
|
||||
#include <LibWeb/PageView.h>
|
||||
#include <LibWeb/Parser/HTMLDocumentParser.h>
|
||||
#include <LibWeb/Parser/HTMLParser.h>
|
||||
#include <LibWeb/RenderingContext.h>
|
||||
#include <LibWeb/Loader/ResourceLoader.h>
|
||||
#include <LibWeb/PageView.h>
|
||||
#include <LibWeb/RenderingContext.h>
|
||||
#include <stdio.h>
|
||||
|
||||
//#define SELECTION_DEBUG
|
||||
|
|
@ -60,6 +56,20 @@ namespace Web {
|
|||
PageView::PageView()
|
||||
: m_main_frame(Web::Frame::create(*this))
|
||||
{
|
||||
main_frame().on_set_document = [this](auto* document) {
|
||||
if (on_set_document)
|
||||
on_set_document(document);
|
||||
layout_and_sync_size();
|
||||
update();
|
||||
};
|
||||
main_frame().on_title_change = [this](auto& title) {
|
||||
if (on_title_change)
|
||||
on_title_change(title);
|
||||
};
|
||||
main_frame().on_load_start = [this](auto& url) {
|
||||
if (on_load_start)
|
||||
on_load_start(url);
|
||||
};
|
||||
main_frame().on_set_needs_display = [this](auto& content_rect) {
|
||||
if (content_rect.is_empty()) {
|
||||
update();
|
||||
|
|
@ -78,39 +88,6 @@ PageView::~PageView()
|
|||
{
|
||||
}
|
||||
|
||||
void PageView::set_document(Document* new_document)
|
||||
{
|
||||
RefPtr<Document> old_document = document();
|
||||
|
||||
if (new_document == old_document)
|
||||
return;
|
||||
|
||||
if (old_document)
|
||||
old_document->on_layout_updated = nullptr;
|
||||
|
||||
main_frame().set_document(new_document);
|
||||
|
||||
if (on_set_document)
|
||||
on_set_document(new_document);
|
||||
|
||||
if (new_document) {
|
||||
new_document->on_layout_updated = [this] {
|
||||
layout_and_sync_size();
|
||||
update();
|
||||
};
|
||||
}
|
||||
|
||||
#ifdef HTML_DEBUG
|
||||
if (document != nullptr) {
|
||||
dbgprintf("\033[33;1mLayout tree before layout:\033[0m\n");
|
||||
::dump_tree(*layout_root());
|
||||
}
|
||||
#endif
|
||||
|
||||
layout_and_sync_size();
|
||||
update();
|
||||
}
|
||||
|
||||
void PageView::layout_and_sync_size()
|
||||
{
|
||||
if (!document())
|
||||
|
|
@ -330,233 +307,12 @@ void PageView::reload()
|
|||
load(main_frame().document()->url());
|
||||
}
|
||||
|
||||
static RefPtr<Document> create_markdown_document(const ByteBuffer& data, const URL& url)
|
||||
bool PageView::load(const URL& url)
|
||||
{
|
||||
auto markdown_document = Markdown::Document::parse(data);
|
||||
if (!markdown_document)
|
||||
return nullptr;
|
||||
|
||||
return parse_html_document(markdown_document->render_to_html(), url);
|
||||
}
|
||||
|
||||
static RefPtr<Document> create_text_document(const ByteBuffer& data, const URL& url)
|
||||
{
|
||||
auto document = adopt(*new Document(url));
|
||||
|
||||
auto html_element = document->create_element("html");
|
||||
document->append_child(html_element);
|
||||
|
||||
auto head_element = document->create_element("head");
|
||||
html_element->append_child(head_element);
|
||||
auto title_element = document->create_element("title");
|
||||
head_element->append_child(title_element);
|
||||
|
||||
auto title_text = document->create_text_node(url.basename());
|
||||
title_element->append_child(title_text);
|
||||
|
||||
auto body_element = document->create_element("body");
|
||||
html_element->append_child(body_element);
|
||||
|
||||
auto pre_element = create_element(document, "pre");
|
||||
body_element->append_child(pre_element);
|
||||
|
||||
pre_element->append_child(document->create_text_node(String::copy(data)));
|
||||
return document;
|
||||
}
|
||||
|
||||
static RefPtr<Document> create_image_document(const ByteBuffer& data, const URL& url)
|
||||
{
|
||||
auto document = adopt(*new Document(url));
|
||||
|
||||
auto image_decoder = Gfx::ImageDecoder::create(data.data(), data.size());
|
||||
auto bitmap = image_decoder->bitmap();
|
||||
ASSERT(bitmap);
|
||||
|
||||
auto html_element = create_element(document, "html");
|
||||
document->append_child(html_element);
|
||||
|
||||
auto head_element = create_element(document, "head");
|
||||
html_element->append_child(head_element);
|
||||
auto title_element = create_element(document, "title");
|
||||
head_element->append_child(title_element);
|
||||
|
||||
auto basename = LexicalPath(url.path()).basename();
|
||||
auto title_text = adopt(*new Text(document, String::format("%s [%dx%d]", basename.characters(), bitmap->width(), bitmap->height())));
|
||||
title_element->append_child(title_text);
|
||||
|
||||
auto body_element = create_element(document, "body");
|
||||
html_element->append_child(body_element);
|
||||
|
||||
auto image_element = create_element(document, "img");
|
||||
image_element->set_attribute(HTML::AttributeNames::src, url.to_string());
|
||||
body_element->append_child(image_element);
|
||||
|
||||
return document;
|
||||
}
|
||||
|
||||
static RefPtr<Document> create_gemini_document(const ByteBuffer& data, const URL& url)
|
||||
{
|
||||
auto markdown_document = Gemini::Document::parse({ (const char*)data.data(), data.size() }, url);
|
||||
|
||||
return parse_html_document(markdown_document->render_to_html(), url);
|
||||
}
|
||||
|
||||
String encoding_from_content_type(const String& content_type)
|
||||
{
|
||||
auto offset = content_type.index_of("charset=");
|
||||
if (offset.has_value())
|
||||
return content_type.substring(offset.value() + 8, content_type.length() - offset.value() - 8).to_lowercase();
|
||||
|
||||
return "utf-8";
|
||||
}
|
||||
|
||||
String mime_type_from_content_type(const String& content_type)
|
||||
{
|
||||
auto offset = content_type.index_of(";");
|
||||
if (offset.has_value())
|
||||
return content_type.substring(0, offset.value()).to_lowercase();
|
||||
|
||||
return content_type;
|
||||
}
|
||||
|
||||
static String guess_mime_type_based_on_filename(const URL& url)
|
||||
{
|
||||
if (url.path().ends_with(".png"))
|
||||
return "image/png";
|
||||
if (url.path().ends_with(".gif"))
|
||||
return "image/gif";
|
||||
if (url.path().ends_with(".md"))
|
||||
return "text/markdown";
|
||||
if (url.path().ends_with(".html") || url.path().ends_with(".htm"))
|
||||
return "text/html";
|
||||
return "text/plain";
|
||||
}
|
||||
|
||||
RefPtr<Document> PageView::create_document_from_mime_type(const ByteBuffer& data, const URL& url, const String& mime_type, const String& encoding)
|
||||
{
|
||||
if (mime_type.starts_with("image/"))
|
||||
return create_image_document(data, url);
|
||||
if (mime_type == "text/plain")
|
||||
return create_text_document(data, url);
|
||||
if (mime_type == "text/markdown")
|
||||
return create_markdown_document(data, url);
|
||||
if (mime_type == "text/gemini")
|
||||
return create_gemini_document(data, url);
|
||||
if (mime_type == "text/html") {
|
||||
if (m_use_old_parser)
|
||||
return parse_html_document(data, url, encoding);
|
||||
HTMLDocumentParser parser(data, encoding);
|
||||
parser.run(url);
|
||||
return parser.document();
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void PageView::load(const URL& url)
|
||||
{
|
||||
dbg() << "PageView::load: " << url;
|
||||
|
||||
if (!url.is_valid()) {
|
||||
load_error_page(url, "Invalid URL");
|
||||
return;
|
||||
}
|
||||
|
||||
if (window())
|
||||
window()->set_override_cursor(GUI::StandardCursor::None);
|
||||
|
||||
if (on_load_start)
|
||||
on_load_start(url);
|
||||
|
||||
ResourceLoader::the().load(
|
||||
url,
|
||||
[this, url](auto data, auto& response_headers) {
|
||||
// FIXME: Also check HTTP status code before redirecting
|
||||
auto location = response_headers.get("Location");
|
||||
if (location.has_value()) {
|
||||
load(location.value());
|
||||
return;
|
||||
}
|
||||
|
||||
if (data.is_null()) {
|
||||
load_error_page(url, "No data");
|
||||
return;
|
||||
}
|
||||
|
||||
String encoding = "utf-8";
|
||||
String mime_type;
|
||||
|
||||
auto content_type = response_headers.get("Content-Type");
|
||||
if (content_type.has_value()) {
|
||||
dbg() << "Content-Type header: _" << content_type.value() << "_";
|
||||
encoding = encoding_from_content_type(content_type.value());
|
||||
mime_type = mime_type_from_content_type(content_type.value());
|
||||
} else {
|
||||
dbg() << "No Content-Type header to go on! Guessing based on filename...";
|
||||
mime_type = guess_mime_type_based_on_filename(url);
|
||||
}
|
||||
|
||||
dbg() << "I believe this content has MIME type '" << mime_type << "', encoding '" << encoding << "'";
|
||||
auto document = create_document_from_mime_type(data, url, mime_type, encoding);
|
||||
ASSERT(document);
|
||||
set_document(document);
|
||||
|
||||
if (!url.fragment().is_empty())
|
||||
scroll_to_anchor(url.fragment());
|
||||
|
||||
if (on_title_change)
|
||||
on_title_change(document->title());
|
||||
},
|
||||
[this, url](auto error) {
|
||||
load_error_page(url, error);
|
||||
});
|
||||
|
||||
if (url.protocol() != "file" && url.protocol() != "about") {
|
||||
URL favicon_url;
|
||||
favicon_url.set_protocol(url.protocol());
|
||||
favicon_url.set_host(url.host());
|
||||
favicon_url.set_port(url.port());
|
||||
favicon_url.set_path("/favicon.ico");
|
||||
|
||||
ResourceLoader::the().load(
|
||||
favicon_url,
|
||||
[this, favicon_url](auto data, auto&) {
|
||||
dbg() << "Favicon downloaded, " << data.size() << " bytes from " << favicon_url;
|
||||
auto decoder = Gfx::ImageDecoder::create(data.data(), data.size());
|
||||
auto bitmap = decoder->bitmap();
|
||||
if (!bitmap) {
|
||||
dbg() << "Could not decode favicon " << favicon_url;
|
||||
return;
|
||||
}
|
||||
dbg() << "Decoded favicon, " << bitmap->size();
|
||||
if (on_favicon_change)
|
||||
on_favicon_change(*bitmap);
|
||||
});
|
||||
}
|
||||
|
||||
this->scroll_to_top();
|
||||
}
|
||||
|
||||
void PageView::load_error_page(const URL& failed_url, const String& error)
|
||||
{
|
||||
auto error_page_url = "file:///res/html/error.html";
|
||||
ResourceLoader::the().load(
|
||||
error_page_url,
|
||||
[this, failed_url, error](auto data, auto&) {
|
||||
ASSERT(!data.is_null());
|
||||
auto html = String::format(
|
||||
String::copy(data).characters(),
|
||||
escape_html_entities(failed_url.to_string()).characters(),
|
||||
escape_html_entities(error).characters());
|
||||
auto document = parse_html_document(html, failed_url);
|
||||
ASSERT(document);
|
||||
set_document(document);
|
||||
if (on_title_change)
|
||||
on_title_change(document->title());
|
||||
},
|
||||
[](auto error) {
|
||||
dbg() << "Failed to load error page: " << error;
|
||||
ASSERT_NOT_REACHED();
|
||||
});
|
||||
return main_frame().loader().load(url);
|
||||
}
|
||||
|
||||
const LayoutDocument* PageView::layout_root() const
|
||||
|
|
@ -601,6 +357,16 @@ void PageView::scroll_to_anchor(const StringView& name)
|
|||
window()->set_override_cursor(GUI::StandardCursor::None);
|
||||
}
|
||||
|
||||
void PageView::set_use_old_parser(bool use_old_parser)
|
||||
{
|
||||
main_frame().loader().set_use_old_parser(use_old_parser);
|
||||
}
|
||||
|
||||
void PageView::load_empty_document()
|
||||
{
|
||||
main_frame().set_document(nullptr);
|
||||
}
|
||||
|
||||
Document* PageView::document()
|
||||
{
|
||||
return main_frame().document();
|
||||
|
|
@ -611,6 +377,11 @@ const Document* PageView::document() const
|
|||
return main_frame().document();
|
||||
}
|
||||
|
||||
void PageView::set_document(Document* document)
|
||||
{
|
||||
main_frame().set_document(document);
|
||||
}
|
||||
|
||||
void PageView::dump_selection(const char* event_name)
|
||||
{
|
||||
UNUSED_PARAM(event_name);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue