0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Make HTMLImageElement loads delay the document load event

Browse source 
This is something we're supposed to do according to the HTML spec.
Note that image loading is currently completely ad-hoc, and this just
adds a simple DocumentLoadEventDelayer to the existing implementation.

This will allow us to use images in layout tests, which rely on the
document load event firing at a predictable time.
This commit is contained in:
Andreas Kling 2023-04-01 15:15:23 +02:00
parent 3709d11212
commit 2413de7e10
Notes: sideshowbarker 2024-07-16 22:05:55 +09:00
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp
View file

@ -28,6 +28,7 @@ HTMLImageElement::HTMLImageElement(DOM::Document& document, DOM::QualifiedName q
this->document().set_needs_layout(); this->document().set_needs_layout();
queue_an_element_task(HTML::Task::Source::DOMManipulation, [this] { queue_an_element_task(HTML::Task::Source::DOMManipulation, [this] {
dispatch_event(DOM::Event::create(this->realm(), EventNames::load).release_value_but_fixme_should_propagate_errors()); dispatch_event(DOM::Event::create(this->realm(), EventNames::load).release_value_but_fixme_should_propagate_errors());
m_load_event_delayer.clear();
}); });
}; };
@ -37,6 +38,7 @@ HTMLImageElement::HTMLImageElement(DOM::Document& document, DOM::QualifiedName q
this->document().set_needs_layout(); this->document().set_needs_layout();
queue_an_element_task(HTML::Task::Source::DOMManipulation, [this] { queue_an_element_task(HTML::Task::Source::DOMManipulation, [this] {
dispatch_event(DOM::Event::create(this->realm(), EventNames::error).release_value_but_fixme_should_propagate_errors()); dispatch_event(DOM::Event::create(this->realm(), EventNames::error).release_value_but_fixme_should_propagate_errors());
m_load_event_delayer.clear();
}); });
}; };
@ -83,8 +85,10 @@ void HTMLImageElement::parse_attribute(DeprecatedFlyString const& name, Deprecat
{ {
HTMLElement::parse_attribute(name, value); HTMLElement::parse_attribute(name, value);
if (name == HTML::AttributeNames::src && !value.is_empty()) if (name == HTML::AttributeNames::src && !value.is_empty()) {
m_image_loader.load(document().parse_url(value)); m_image_loader.load(document().parse_url(value));
m_load_event_delayer.emplace(document());
}
if (name == HTML::AttributeNames::alt) { if (name == HTML::AttributeNames::alt) {
if (layout_node()) if (layout_node())

3
Userland/Libraries/LibWeb/HTML/HTMLImageElement.h
View file

@ -9,6 +9,7 @@
#include <AK/ByteBuffer.h> #include <AK/ByteBuffer.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <LibGfx/Forward.h> #include <LibGfx/Forward.h>
#include <LibWeb/DOM/DocumentLoadEventDelayer.h>
#include <LibWeb/HTML/FormAssociatedElement.h> #include <LibWeb/HTML/FormAssociatedElement.h>
#include <LibWeb/HTML/HTMLElement.h> #include <LibWeb/HTML/HTMLElement.h>
#include <LibWeb/Loader/ImageLoader.h> #include <LibWeb/Loader/ImageLoader.h>
@ -54,6 +55,8 @@ private:
virtual JS::GCPtr<Layout::Node> create_layout_node(NonnullRefPtr<CSS::StyleProperties>) override; virtual JS::GCPtr<Layout::Node> create_layout_node(NonnullRefPtr<CSS::StyleProperties>) override;
ImageLoader m_image_loader; ImageLoader m_image_loader;
Optional<DOM::DocumentLoadEventDelayer> m_load_event_delayer;
}; };
} }