RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

LibWeb: Merge Document::layout() and Document::update_layout()

Browse source 
There is now only Document::update_layout().
This commit is contained in:
Andreas Kling 2020-12-14 10:39:39 +01:00
parent dbfce38c90
commit 3c9dcec442
5 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibWeb/DOM/Document.cpp
View file

@ -287,7 +287,7 @@ void Document::attach_to_frame(Badge<Frame>, Frame& frame)
node.document_did_attach_to_frame(frame); node.document_did_attach_to_frame(frame);
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
layout(); update_layout();
} }
void Document::detach_from_frame(Badge<Frame>, Frame& frame) void Document::detach_from_frame(Badge<Frame>, Frame& frame)
@ -376,10 +376,10 @@ void Document::invalidate_layout()
void Document::force_layout() void Document::force_layout()
{ {
invalidate_layout(); invalidate_layout();
layout(); update_layout();
} }
void Document::layout() void Document::update_layout()
{ {
if (!frame()) if (!frame())
return; return;
@ -410,14 +410,6 @@ void Document::update_style()
update_layout(); update_layout();
} }
void Document::update_layout()
{
if (!frame())
return;
layout();
}
RefPtr<Layout::Node> Document::create_layout_node(const CSS::StyleProperties*) RefPtr<Layout::Node> Document::create_layout_node(const CSS::StyleProperties*)
{ {
return adopt(*new Layout::InitialContainingBlockBox(*this, CSS::StyleProperties::create())); return adopt(*new Layout::InitialContainingBlockBox(*this, CSS::StyleProperties::create()));

1
Libraries/LibWeb/DOM/Document.h
View file

@ -117,7 +117,6 @@ public:
Color visited_link_color() const; Color visited_link_color() const;
void set_visited_link_color(Color); void set_visited_link_color(Color);
void layout();
void force_layout(); void force_layout();
void invalidate_layout(); void invalidate_layout();

2
Libraries/LibWeb/HTML/HTMLElement.cpp
View file

@ -113,7 +113,7 @@ String HTMLElement::inner_text()
StringBuilder builder; StringBuilder builder;
// innerText for element being rendered takes visibility into account, so force a layout and then walk the layout tree. // innerText for element being rendered takes visibility into account, so force a layout and then walk the layout tree.
document().layout(); document().update_layout();
if (!layout_node()) if (!layout_node())
return text_content(); return text_content();

2
Libraries/LibWeb/Page/Frame.cpp
View file

@ -103,7 +103,7 @@ void Frame::set_size(const Gfx::IntSize& size)
return; return;
m_size = size; m_size = size;
if (m_document) if (m_document)
m_document->layout(); m_document->update_layout();
} }
void Frame::set_viewport_scroll_offset(const Gfx::IntPoint& offset) void Frame::set_viewport_scroll_offset(const Gfx::IntPoint& offset)

2
Services/WebContent/PageHost.cpp
View file

@ -102,7 +102,7 @@ void PageHost::set_viewport_rect(const Gfx::IntRect& rect)
{ {
page().main_frame().set_size(rect.size()); page().main_frame().set_size(rect.size());
if (page().main_frame().document()) if (page().main_frame().document())
page().main_frame().document()->layout(); page().main_frame().document()->update_layout();
page().main_frame().set_viewport_scroll_offset(rect.location()); page().main_frame().set_viewport_scroll_offset(rect.location());
} }