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

LibWeb: Unbreak favicon notifications after Page refactoring

Browse source 
Favicon updates now get plumbed from FrameLoader to the PageClient.
This commit is contained in:
Andreas Kling 2020-06-08 21:35:31 +02:00
parent e04d68a03a
commit 883dc9260d
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/Frame/Frame.h
View file

@ -60,8 +60,6 @@ public:
void set_needs_display(const Gfx::Rect&); void set_needs_display(const Gfx::Rect&);
Function<void(const Gfx::Bitmap&)> on_favicon_change;
void set_viewport_rect(const Gfx::Rect&); void set_viewport_rect(const Gfx::Rect&);
Gfx::Rect viewport_rect() const { return m_viewport_rect; } Gfx::Rect viewport_rect() const { return m_viewport_rect; }

3
Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -172,8 +172,7 @@ bool FrameLoader::load(const URL& url)
return; return;
} }
dbg() << "Decoded favicon, " << bitmap->size(); dbg() << "Decoded favicon, " << bitmap->size();
if (frame().on_favicon_change) frame().page().client().page_did_change_favicon(*bitmap);
frame().on_favicon_change(*bitmap);
}); });
} }

1
Libraries/LibWeb/Page.h
View file

@ -82,6 +82,7 @@ public:
virtual void page_did_unhover_link() { } virtual void page_did_unhover_link() { }
virtual void page_did_request_scroll_to_anchor([[maybe_unused]] const String& fragment) { } virtual void page_did_request_scroll_to_anchor([[maybe_unused]] const String& fragment) { }
virtual void page_did_invalidate(const Gfx::Rect&) { } virtual void page_did_invalidate(const Gfx::Rect&) { }
virtual void page_did_change_favicon(const Gfx::Bitmap&) { }
}; };
} }

6
Libraries/LibWeb/PageView.cpp
View file

@ -145,6 +145,12 @@ void PageView::page_did_invalidate(const Gfx::Rect&)
update(); update();
} }
void PageView::page_did_change_favicon(const Gfx::Bitmap& bitmap)
{
if (on_favicon_change)
on_favicon_change(bitmap);
}
void PageView::layout_and_sync_size() void PageView::layout_and_sync_size()
{ {
if (!document()) if (!document())

1
Libraries/LibWeb/PageView.h
View file

@ -105,6 +105,7 @@ private:
virtual void page_did_unhover_link() override; virtual void page_did_unhover_link() override;
virtual void page_did_request_scroll_to_anchor(const String& fragment) override; virtual void page_did_request_scroll_to_anchor(const String& fragment) override;
virtual void page_did_invalidate(const Gfx::Rect&) override; virtual void page_did_invalidate(const Gfx::Rect&) override;
virtual void page_did_change_favicon(const Gfx::Bitmap&) override;
void layout_and_sync_size(); void layout_and_sync_size();