beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Delete m_selected flag from Paintable

Browse source 
This was redundant when Paintable already has `m_selection_state` that
could be none.
This commit is contained in:
Aliaksandr Kalenik 2024-11-14 19:43:08 +03:00 committed by Andreas Kling
parent 5b67f17551
commit d7caa426a0
Notes: github-actions[bot] 2024-11-14 18:51:50 +00:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/LadybirdBrowser/ladybird/commit/d7caa426a0e
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2344
9 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1234,8 +1234,6 @@ void Document::update_layout()
page().client().page_did_layout();
}
paintable()->update_selection();
m_needs_layout = false;
// Scrolling by zero offset will clamp scroll offset back to valid range if it was out of bounds

1
Libraries/LibWeb/DOM/Range.cpp
View file

@ -99,7 +99,6 @@ void Range::update_associated_selection()
auto& document = m_start_container->document();
if (auto* viewport = document.paintable()) {
viewport->recompute_selection_states(*this);
viewport->update_selection();
viewport->set_needs_display();
}

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

@ -672,11 +672,9 @@ void FormAssociatedTextControlElement::selection_was_changed()
if (!text_paintable)
return;
if (m_selection_start == m_selection_end) {
text_paintable->set_selected(false);
text_paintable->set_selection_state(Painting::Paintable::SelectionState::None);
text_node->document().reset_cursor_blink_cycle();
} else {
text_paintable->set_selected(true);
text_paintable->set_selection_state(Painting::Paintable::SelectionState::StartAndEnd);
}
text_paintable->set_needs_display();

6
Libraries/LibWeb/HTML/HTMLInputElement.cpp
View file

@ -1182,9 +1182,6 @@ void HTMLInputElement::did_receive_focus()
return;
m_text_node->invalidate_style(DOM::StyleInvalidationReason::DidReceiveFocus);
if (auto* paintable = m_text_node->paintable())
paintable->set_selected(true);
if (m_placeholder_text_node)
m_placeholder_text_node->invalidate_style(DOM::StyleInvalidationReason::DidReceiveFocus);
}
@ -1193,9 +1190,6 @@ void HTMLInputElement::did_lose_focus()
{
if (m_text_node) {
m_text_node->invalidate_style(DOM::StyleInvalidationReason::DidLoseFocus);
if (auto* paintable = m_text_node->paintable())
paintable->set_selected(false);
}
if (m_placeholder_text_node)

6
Libraries/LibWeb/HTML/HTMLTextAreaElement.cpp
View file

@ -79,9 +79,6 @@ void HTMLTextAreaElement::did_receive_focus()
return;
m_text_node->invalidate_style(DOM::StyleInvalidationReason::DidReceiveFocus);
if (auto* paintable = m_text_node->paintable())
paintable->set_selected(true);
if (m_placeholder_text_node)
m_placeholder_text_node->invalidate_style(DOM::StyleInvalidationReason::DidReceiveFocus);
}
@ -91,9 +88,6 @@ void HTMLTextAreaElement::did_lose_focus()
if (m_text_node)
m_text_node->invalidate_style(DOM::StyleInvalidationReason::DidLoseFocus);
if (auto* paintable = m_text_node->paintable())
paintable->set_selected(false);
if (m_placeholder_text_node)
m_placeholder_text_node->invalidate_style(DOM::StyleInvalidationReason::DidLoseFocus);

3
Libraries/LibWeb/Painting/Paintable.h
View file

@ -62,7 +62,6 @@ public:
[[nodiscard]] bool is_absolutely_positioned() const { return m_absolutely_positioned; }
[[nodiscard]] bool is_floating() const { return m_floating; }
[[nodiscard]] bool is_inline() const { return m_inline; }
[[nodiscard]] bool is_selected() const { return m_selected; }
[[nodiscard]] CSS::Display display() const;
template<typename U, typename Callback>
@ -228,7 +227,6 @@ public:
SelectionState selection_state() const { return m_selection_state; }
void set_selection_state(SelectionState state) { m_selection_state = state; }
void set_selected(bool selected) { m_selected = selected; }
Gfx::AffineTransform compute_combined_css_transform() const;
@ -263,7 +261,6 @@ private:
bool m_absolutely_positioned : 1 { false };
bool m_floating : 1 { false };
bool m_inline : 1 { false };
bool m_selected : 1 { false };
};
inline DOM::Node* HitTestResult::dom_node()

3
Libraries/LibWeb/Painting/PaintableFragment.cpp
View file

@ -187,9 +187,6 @@ Gfx::Orientation PaintableFragment::orientation() const
CSSPixelRect PaintableFragment::selection_rect(Gfx::Font const& font) const
{
if (!paintable().is_selected())
return {};
if (auto const* focused_element = paintable().document().focused_element(); focused_element && is<HTML::FormAssociatedTextControlElement>(*focused_element)) {
HTML::FormAssociatedTextControlElement const* text_control_element = nullptr;
if (is<HTML::HTMLInputElement>(*focused_element)) {

26
Libraries/LibWeb/Painting/ViewportPaintable.cpp
View file

@ -278,32 +278,6 @@ JS::GCPtr<Selection::Selection> ViewportPaintable::selection() const
return const_cast<DOM::Document&>(document()).get_selection();
}
void ViewportPaintable::update_selection()
{
// 1. Start by setting all layout nodes to unselected.
for_each_in_inclusive_subtree([&](auto& layout_node) {
layout_node.set_selected(false);
return TraversalDecision::Continue;
});
// 2. If there is no active Selection or selected Range, return.
auto selection = document().get_selection();
if (!selection)
return;
auto range = selection->range();
if (!range)
return;
auto* start_container = range->start_container();
auto* end_container = range->end_container();
// 3. Mark the nodes included in range selected.
for (auto* node = start_container; node && node != end_container->next_in_pre_order(); node = node->next_in_pre_order()) {
if (auto* paintable = node->paintable())
paintable->set_selected(true);
}
}
void ViewportPaintable::recompute_selection_states(DOM::Range& range)
{
// 1. Start by resetting the selection state of all layout nodes to None.

1
Libraries/LibWeb/Painting/ViewportPaintable.h
View file

@ -33,7 +33,6 @@ public:
JS::GCPtr<Selection::Selection> selection() const;
void recompute_selection_states(DOM::Range&);
void update_selection();
bool handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int wheel_delta_x, int wheel_delta_y) override;