beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Conditionally update an object's children when its state changes

Browse source 
We should only update the object children of an object when the parent's
representation changes to/from falling back to its children.
This commit is contained in:
Timothy Flynn 2022-03-24 11:09:45 -04:00 committed by Andreas Kling
parent f11d6e137c
commit a002c8156b
Notes: sideshowbarker 2024-07-17 16:50:10 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/a002c8156b
Pull-request: https://github.com/SerenityOS/serenity/pull/13236
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp
View file

@ -183,8 +183,7 @@ void HTMLObjectElement::run_object_representation_handler_steps(Optional<String>
m_nested_browsing_context->loader().load(url, FrameLoader::Type::IFrame);
// The object element represents its nested browsing context.
m_representation = Representation::NestedBrowsingContext;
run_object_representation_completed_steps();
run_object_representation_completed_steps(Representation::NestedBrowsingContext);
}
// * If the resource type starts with "image/", and support for images has not been disabled
@ -194,8 +193,6 @@ void HTMLObjectElement::run_object_representation_handler_steps(Optional<String>
// Apply the image sniffing rules to determine the type of the image.
// The object element represents the specified image.
m_representation = Representation::Image;
// If the image cannot be rendered, e.g. because it is malformed or in an unsupported format, jump to the step below labeled fallback.
if (!resource()->has_encoded_data())
return run_object_representation_fallback_steps();
@ -211,17 +208,17 @@ void HTMLObjectElement::run_object_representation_handler_steps(Optional<String>
}
// https://html.spec.whatwg.org/multipage/iframe-embed-object.html#the-object-element:the-object-element-19
void HTMLObjectElement::run_object_representation_completed_steps()
void HTMLObjectElement::run_object_representation_completed_steps(Representation representation)
{
// 4.10. The element's contents are not part of what the object element represents.
// 4.11. If the object element does not represent its nested browsing context, then once the resource is completely loaded, queue an element task on the DOM manipulation task source given the object element to fire an event named load at the element.
if (m_representation != Representation::NestedBrowsingContext) {
if (representation != Representation::NestedBrowsingContext) {
queue_an_element_task(HTML::Task::Source::DOMManipulation, [&]() {
dispatch_event(DOM::Event::create(HTML::EventNames::load));
});
}
update_layout_and_child_objects();
update_layout_and_child_objects(representation);
// 4.12. Return.
}
@ -230,8 +227,7 @@ void HTMLObjectElement::run_object_representation_completed_steps()
void HTMLObjectElement::run_object_representation_fallback_steps()
{
// 6. Fallback: The object element represents the element's children, ignoring any leading param element children. This is the element's fallback content. If the element has an instantiated plugin, then unload it. If the element's nested browsing context is non-null, then it must be discarded and then set to null.
m_representation = Representation::Children;
update_layout_and_child_objects();
update_layout_and_child_objects(Representation::Children);
}
void HTMLObjectElement::convert_resource_to_image()
@ -243,7 +239,7 @@ void HTMLObjectElement::convert_resource_to_image()
m_image_loader.emplace(*this);
m_image_loader->on_load = [this] {
run_object_representation_completed_steps();
run_object_representation_completed_steps(Representation::Image);
};
m_image_loader->on_fail = [this] {
run_object_representation_fallback_steps();
@ -252,13 +248,17 @@ void HTMLObjectElement::convert_resource_to_image()
m_image_loader->adopt_object_resource({}, *resource());
}
void HTMLObjectElement::update_layout_and_child_objects()
void HTMLObjectElement::update_layout_and_child_objects(Representation representation)
{
for_each_child_of_type<HTMLObjectElement>([](auto& object) {
object.queue_element_task_to_run_object_representation_steps();
return IterationDecision::Continue;
});
if ((m_representation == Representation::Children && representation != Representation::Children)
|| (m_representation != Representation::Children && representation == Representation::Children)) {
for_each_child_of_type<HTMLObjectElement>([](auto& object) {
object.queue_element_task_to_run_object_representation_steps();
return IterationDecision::Continue;
});
}
m_representation = representation;
set_needs_style_update(true);
document().set_needs_layout();
}

4
Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h
View file

@ -50,11 +50,11 @@ private:
void queue_element_task_to_run_object_representation_steps();
void run_object_representation_handler_steps(Optional<String> resource_type);
void run_object_representation_completed_steps();
void run_object_representation_completed_steps(Representation);
void run_object_representation_fallback_steps();
void convert_resource_to_image();
void update_layout_and_child_objects();
void update_layout_and_child_objects(Representation);
// ^ResourceClient
virtual void resource_did_load() override;