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

LibWeb: Move "visible in viewport" state tracking to ImageLoader

Browse source 
This should technically apply to any LayoutImage, so let's just move
it to ImageLoader.
This commit is contained in:
Andreas Kling 2020-06-14 19:32:23 +02:00
parent c45615128b
commit 73c9f7ebf4
7 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,9 +87,4 @@ const Gfx::Bitmap* HTMLImageElement::bitmap() const
return m_image_loader.bitmap(); return m_image_loader.bitmap();
} }
void HTMLImageElement::set_visible_in_viewport(Badge<LayoutDocument>, bool visible_in_viewport)
{
m_image_loader.set_visible_in_viewport(visible_in_viewport);
}
} }

2
Libraries/LibWeb/DOM/HTMLImageElement.h
View file

@ -51,8 +51,6 @@ public:
const Gfx::Bitmap* bitmap() const; const Gfx::Bitmap* bitmap() const;
const Gfx::ImageDecoder* image_decoder() const; const Gfx::ImageDecoder* image_decoder() const;
void set_visible_in_viewport(Badge<LayoutDocument>, bool);
private: private:
void animate(); void animate();

3
Libraries/LibWeb/Layout/LayoutDocument.cpp
View file

@ -71,8 +71,7 @@ void LayoutDocument::did_set_viewport_rect(Badge<Frame>, const Gfx::IntRect& a_v
{ {
Gfx::FloatRect viewport_rect(a_viewport_rect.x(), a_viewport_rect.y(), a_viewport_rect.width(), a_viewport_rect.height()); Gfx::FloatRect viewport_rect(a_viewport_rect.x(), a_viewport_rect.y(), a_viewport_rect.width(), a_viewport_rect.height());
for_each_in_subtree_of_type<LayoutImage>([&](auto& layout_image) { for_each_in_subtree_of_type<LayoutImage>([&](auto& layout_image) {
if (is<HTMLImageElement>(layout_image.node())) const_cast<LayoutImage&>(layout_image).set_visible_in_viewport({}, viewport_rect.intersects(layout_image.absolute_rect()));
const_cast<HTMLImageElement&>(to<HTMLImageElement>(layout_image.node())).set_visible_in_viewport({}, viewport_rect.intersects(layout_image.absolute_rect()));
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
} }

5
Libraries/LibWeb/Layout/LayoutImage.cpp
View file

@ -108,4 +108,9 @@ bool LayoutImage::renders_as_alt_text() const
return false; return false;
} }
void LayoutImage::set_visible_in_viewport(Badge<LayoutDocument>, bool visible_in_viewport)
{
m_image_loader.set_visible_in_viewport(visible_in_viewport);
}
} }

2
Libraries/LibWeb/Layout/LayoutImage.h
View file

@ -45,6 +45,8 @@ public:
bool renders_as_alt_text() const; bool renders_as_alt_text() const;
void set_visible_in_viewport(Badge<LayoutDocument>, bool);
private: private:
virtual const char* class_name() const override { return "LayoutImage"; } virtual const char* class_name() const override { return "LayoutImage"; }
virtual bool is_image() const override { return true; } virtual bool is_image() const override { return true; }

4
Libraries/LibWeb/Loader/ImageLoader.cpp
View file

@ -44,7 +44,7 @@ void ImageLoader::load(const URL& url)
set_resource(ResourceLoader::the().load_resource(Resource::Type::Image, request)); set_resource(ResourceLoader::the().load_resource(Resource::Type::Image, request));
} }
void ImageLoader::set_visible_in_viewport(bool visible_in_viewport) void ImageLoader::set_visible_in_viewport(bool visible_in_viewport) const
{ {
if (m_visible_in_viewport == visible_in_viewport) if (m_visible_in_viewport == visible_in_viewport)
return; return;
@ -54,7 +54,7 @@ void ImageLoader::set_visible_in_viewport(bool visible_in_viewport)
// the whole document, updating "is visible in viewport" flags, and this could lead // the whole document, updating "is visible in viewport" flags, and this could lead
// to the same bitmap being marked volatile back and forth unnecessarily. // to the same bitmap being marked volatile back and forth unnecessarily.
if (resource()) if (resource())
resource()->update_volatility(); const_cast<ImageResource*>(resource())->update_volatility();
} }
void ImageLoader::resource_did_load() void ImageLoader::resource_did_load()

4
Libraries/LibWeb/Loader/ImageLoader.h
View file

@ -41,7 +41,7 @@ public:
const Gfx::Bitmap* bitmap() const; const Gfx::Bitmap* bitmap() const;
const Gfx::ImageDecoder* image_decoder() const; const Gfx::ImageDecoder* image_decoder() const;
void set_visible_in_viewport(bool); void set_visible_in_viewport(bool) const;
Function<void()> on_load; Function<void()> on_load;
Function<void()> on_fail; Function<void()> on_fail;
@ -57,7 +57,7 @@ private:
void animate(); void animate();
RefPtr<Gfx::ImageDecoder> m_decoder; RefPtr<Gfx::ImageDecoder> m_decoder;
bool m_visible_in_viewport { false }; mutable bool m_visible_in_viewport { false };
size_t m_current_frame_index { 0 }; size_t m_current_frame_index { 0 };
size_t m_loops_completed { 0 }; size_t m_loops_completed { 0 };