RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 22:25:07 +00:00
Code Issues Activity Actions

LibWeb: Add support for animated images to HTMLImageElement

Browse source 
Uses a Core::Timer (similar to HTMLBlinkElement) to transition between
frames of an animated image. Also keeps track of the number of animation
loops.
This commit is contained in:
Peter Nelson 2020-05-03 17:57:13 +01:00 • committed by Andreas Kling
parent d22bb92764
commit b8f5b81019
2 changed files with 44 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Libraries/LibWeb/DOM/HTMLImageElement.cpp
View file

@ -24,6 +24,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <LibCore/Timer.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h>
#include <LibWeb/CSS/StyleResolver.h>
@ -37,6 +38,7 @@ namespace Web {
HTMLImageElement::HTMLImageElement(Document& document, const FlyString& tag_name)
: HTMLElement(document, tag_name)
, m_timer(Core::Timer::construct())
{
}
@ -66,12 +68,42 @@ void HTMLImageElement::load_image(const String& src)
m_encoded_data = data;
m_image_decoder = Gfx::ImageDecoder::create(m_encoded_data.data(), m_encoded_data.size());
if (m_image_decoder->is_animated() && m_image_decoder->frame_count() > 1) {
const auto& first_frame = m_image_decoder->frame(0);
m_timer->set_interval(first_frame.duration);
m_timer->on_timeout = [this] { animate(); };
m_timer->start();
}
document().update_layout();
dispatch_event(Event::create("load"));
});
}
void HTMLImageElement::animate()
{
if (!layout_node()) {
return;
}
m_current_frame_index = (m_current_frame_index + 1) % m_image_decoder->frame_count();
const auto& current_frame = m_image_decoder->frame(m_current_frame_index);
if (current_frame.duration != m_timer->interval()) {
m_timer->restart(current_frame.duration);
}
if (m_current_frame_index == m_image_decoder->frame_count() - 1) {
++m_loops_completed;
if (m_loops_completed > 0 && m_loops_completed == m_image_decoder->loop_count()) {
m_timer->stop();
}
}
layout_node()->set_needs_display();
}
int HTMLImageElement::preferred_width() const
{
bool ok = false;
@ -111,6 +143,11 @@ const Gfx::Bitmap* HTMLImageElement::bitmap() const
{
if (!m_image_decoder)
return nullptr;
if (m_image_decoder->is_animated()) {
return m_image_decoder->frame(m_current_frame_index).image;
}
return m_image_decoder->bitmap();
}