Skip to content

Commit e816a92

Browse files
kalenikaliaksandrgmta
authored andcommitted
LibWeb: Move clip_frames from public to private in ViewportPaintable
1 parent 47b512e commit e816a92

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Libraries/LibWeb/Painting/ViewportPaintable.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,20 @@ void ViewportPaintable::assign_clip_frames()
127127
auto has_hidden_overflow = overflow_x != CSS::Overflow::Visible || overflow_y != CSS::Overflow::Visible;
128128
if (has_hidden_overflow || paintable_box.get_clip_rect().has_value() || paintable_box.layout_node().has_paint_containment()) {
129129
auto clip_frame = adopt_ref(*new ClipFrame());
130-
clip_state.set(paintable_box, move(clip_frame));
130+
m_clip_state.set(paintable_box, move(clip_frame));
131131
}
132132
return TraversalDecision::Continue;
133133
});
134134

135135
for_each_in_subtree([&](auto& paintable) {
136136
if (paintable.is_paintable_box()) {
137137
auto& paintable_box = static_cast<PaintableBox&>(paintable);
138-
if (auto clip_frame = clip_state.get(paintable_box); clip_frame.has_value()) {
138+
if (auto clip_frame = m_clip_state.get(paintable_box); clip_frame.has_value()) {
139139
paintable_box.set_own_clip_frame(clip_frame.value());
140140
}
141141
}
142142
for (auto block = paintable.containing_block(); !block->is_viewport_paintable(); block = block->containing_block()) {
143-
if (auto clip_frame = clip_state.get(block); clip_frame.has_value()) {
143+
if (auto clip_frame = m_clip_state.get(block); clip_frame.has_value()) {
144144
if (paintable.is_paintable_box()) {
145145
auto& paintable_box = static_cast<PaintableBox&>(paintable);
146146
paintable_box.set_enclosing_clip_frame(clip_frame.value());
@@ -153,7 +153,7 @@ void ViewportPaintable::assign_clip_frames()
153153
return TraversalDecision::Continue;
154154
});
155155

156-
for (auto& it : clip_state) {
156+
for (auto& it : m_clip_state) {
157157
auto const& paintable_box = *it.key;
158158
auto& clip_frame = *it.value;
159159
for (auto const* block = &paintable_box.layout_node_with_style_and_box_metrics(); !block->is_viewport(); block = block->containing_block()) {
@@ -404,7 +404,7 @@ bool ViewportPaintable::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, un
404404
void ViewportPaintable::visit_edges(Visitor& visitor)
405405
{
406406
Base::visit_edges(visitor);
407-
visitor.visit(clip_state);
407+
visitor.visit(m_clip_state);
408408
visitor.visit(m_paintable_boxes_with_auto_content_visibility);
409409
}
410410

Libraries/LibWeb/Painting/ViewportPaintable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class WEB_API ViewportPaintable final : public PaintableWithLines {
2727
void assign_scroll_frames();
2828
void refresh_scroll_state();
2929

30-
HashMap<GC::Ptr<PaintableBox const>, RefPtr<ClipFrame>> clip_state;
3130
void assign_clip_frames();
3231

3332
void resolve_paint_only_properties();
@@ -53,6 +52,7 @@ class WEB_API ViewportPaintable final : public PaintableWithLines {
5352

5453
virtual void visit_edges(Visitor&) override;
5554

55+
HashMap<GC::Ptr<PaintableBox const>, RefPtr<ClipFrame>> m_clip_state;
5656
ScrollState m_scroll_state;
5757
bool m_needs_to_refresh_scroll_state { true };
5858

0 commit comments

Comments
 (0)