Browse Source

LibWeb/Layout: Rename BlockContainer::paint{_box => able_with_lines}()

It returns a PaintableBox (a PaintableWithLines, to be specific), not a
'PaintBox'. paintable_box() without the cast is already available
through BlockContainer's Box base class, we don't need to shadow it.
Linus Groh 2 years ago
parent
commit
a75915f055

+ 2 - 2
Userland/Libraries/LibWeb/Dump.cpp

@@ -241,8 +241,8 @@ void dump_tree(StringBuilder& builder, Layout::Node const& layout_node, bool sho
 
     if (is<Layout::BlockContainer>(layout_node) && static_cast<Layout::BlockContainer const&>(layout_node).children_are_inline()) {
         auto& block = static_cast<Layout::BlockContainer const&>(layout_node);
-        for (size_t line_box_index = 0; block.paint_box() && line_box_index < block.paint_box()->line_boxes().size(); ++line_box_index) {
-            auto& line_box = block.paint_box()->line_boxes()[line_box_index];
+        for (size_t line_box_index = 0; block.paintable_with_lines() && line_box_index < block.paintable_with_lines()->line_boxes().size(); ++line_box_index) {
+            auto& line_box = block.paintable_with_lines()->line_boxes()[line_box_index];
             for (size_t i = 0; i < indent; ++i)
                 builder.append("  "sv);
             builder.appendff("  {}line {}{} width: {}, height: {}, bottom: {}, baseline: {}\n",

+ 1 - 1
Userland/Libraries/LibWeb/Layout/BlockContainer.cpp

@@ -21,7 +21,7 @@ BlockContainer::BlockContainer(DOM::Document& document, DOM::Node* node, CSS::Co
 
 BlockContainer::~BlockContainer() = default;
 
-Painting::PaintableWithLines const* BlockContainer::paint_box() const
+Painting::PaintableWithLines const* BlockContainer::paintable_with_lines() const
 {
     return static_cast<Painting::PaintableWithLines const*>(Box::paintable_box());
 }

+ 1 - 1
Userland/Libraries/LibWeb/Layout/BlockContainer.h

@@ -20,7 +20,7 @@ public:
     BlockContainer(DOM::Document&, DOM::Node*, CSS::ComputedValues);
     virtual ~BlockContainer() override;
 
-    Painting::PaintableWithLines const* paint_box() const;
+    Painting::PaintableWithLines const* paintable_with_lines() const;
 
     virtual JS::GCPtr<Painting::Paintable> create_paintable() const override;
 

+ 3 - 3
Userland/Libraries/LibWeb/Layout/Label.cpp

@@ -40,7 +40,7 @@ void Label::handle_mouseup_on_label(Badge<Painting::TextPaintable>, CSSPixelPoin
 
     if (auto* control = labeled_control(); control) {
         bool is_inside_control = control->paintable_box()->absolute_rect().contains(position);
-        bool is_inside_label = paint_box()->absolute_rect().contains(position);
+        bool is_inside_label = paintable_box()->absolute_rect().contains(position);
 
         if (is_inside_control || is_inside_label)
             control->paintable()->handle_associated_label_mouseup({});
@@ -56,7 +56,7 @@ void Label::handle_mousemove_on_label(Badge<Painting::TextPaintable>, CSSPixelPo
 
     if (auto* control = labeled_control(); control) {
         bool is_inside_control = control->paintable_box()->absolute_rect().contains(position);
-        bool is_inside_label = paint_box()->absolute_rect().contains(position);
+        bool is_inside_label = paintable_box()->absolute_rect().contains(position);
 
         control->paintable()->handle_associated_label_mousemove({}, is_inside_control || is_inside_label);
     }
@@ -65,7 +65,7 @@ void Label::handle_mousemove_on_label(Badge<Painting::TextPaintable>, CSSPixelPo
 bool Label::is_inside_associated_label(LabelableNode const& control, CSSPixelPoint position)
 {
     if (auto* label = label_for_control_node(control); label)
-        return label->paint_box()->absolute_rect().contains(position);
+        return label->paintable_box()->absolute_rect().contains(position);
     return false;
 }
 

+ 6 - 6
Userland/Libraries/LibWeb/Layout/LayoutState.cpp

@@ -75,11 +75,11 @@ void LayoutState::commit()
         // For boxes, transfer all the state needed for painting.
         if (is<Layout::Box>(node)) {
             auto& box = static_cast<Layout::Box const&>(node);
-            auto& paint_box = const_cast<Painting::PaintableBox&>(*box.paintable_box());
-            paint_box.set_offset(used_values.offset);
-            paint_box.set_content_size(used_values.content_width(), used_values.content_height());
-            paint_box.set_overflow_data(move(used_values.overflow_data));
-            paint_box.set_containing_line_box_fragment(used_values.containing_line_box_fragment);
+            auto& paintable_box = const_cast<Painting::PaintableBox&>(*box.paintable_box());
+            paintable_box.set_offset(used_values.offset);
+            paintable_box.set_content_size(used_values.content_width(), used_values.content_height());
+            paintable_box.set_overflow_data(move(used_values.overflow_data));
+            paintable_box.set_containing_line_box_fragment(used_values.containing_line_box_fragment);
 
             if (is<Layout::BlockContainer>(box)) {
                 for (auto& line_box : used_values.line_boxes) {
@@ -88,7 +88,7 @@ void LayoutState::commit()
                             text_nodes.set(static_cast<Layout::TextNode*>(const_cast<Layout::Node*>(&fragment.layout_node())));
                     }
                 }
-                static_cast<Painting::PaintableWithLines&>(paint_box).set_line_boxes(move(used_values.line_boxes));
+                static_cast<Painting::PaintableWithLines&>(paintable_box).set_line_boxes(move(used_values.line_boxes));
             }
         }
     }

+ 5 - 5
Userland/Libraries/LibWeb/Layout/Viewport.cpp

@@ -26,14 +26,14 @@ JS::GCPtr<Selection::Selection> Viewport::selection() const
 
 void Viewport::build_stacking_context_tree_if_needed()
 {
-    if (paint_box()->stacking_context())
+    if (paintable_box()->stacking_context())
         return;
     build_stacking_context_tree();
 }
 
 void Viewport::build_stacking_context_tree()
 {
-    const_cast<Painting::PaintableWithLines*>(paint_box())->set_stacking_context(make<Painting::StackingContext>(*this, nullptr));
+    const_cast<Painting::PaintableBox*>(paintable_box())->set_stacking_context(make<Painting::StackingContext>(*this, nullptr));
 
     for_each_in_subtree_of_type<Box>([&](Box& box) {
         if (!box.paintable_box())
@@ -49,15 +49,15 @@ void Viewport::build_stacking_context_tree()
         return IterationDecision::Continue;
     });
 
-    const_cast<Painting::PaintableWithLines*>(paint_box())->stacking_context()->sort();
+    const_cast<Painting::PaintableBox*>(paintable_box())->stacking_context()->sort();
 }
 
 void Viewport::paint_all_phases(PaintContext& context)
 {
     build_stacking_context_tree_if_needed();
-    context.painter().fill_rect(context.enclosing_device_rect(paint_box()->absolute_rect()).to_type<int>(), document().background_color(context.palette()));
+    context.painter().fill_rect(context.enclosing_device_rect(paintable_box()->absolute_rect()).to_type<int>(), document().background_color(context.palette()));
     context.painter().translate(-context.device_viewport_rect().location().to_type<int>());
-    paint_box()->stacking_context()->paint(context);
+    paintable_box()->stacking_context()->paint(context);
 }
 
 void Viewport::recompute_selection_states()

+ 1 - 1
Userland/Services/WebContent/ConnectionFromClient.cpp

@@ -352,7 +352,7 @@ void ConnectionFromClient::debug_request(DeprecatedString const& request, Deprec
     if (request == "dump-stacking-context-tree") {
         if (auto* doc = page().top_level_browsing_context().active_document()) {
             if (auto* viewport = doc->layout_node()) {
-                if (auto* stacking_context = viewport->paint_box()->stacking_context())
+                if (auto* stacking_context = viewport->paintable_box()->stacking_context())
                     stacking_context->dump();
             }
         }

+ 3 - 3
Userland/Services/WebContent/PageHost.cpp

@@ -155,10 +155,10 @@ void PageHost::page_did_layout()
 {
     auto* layout_root = this->layout_root();
     VERIFY(layout_root);
-    if (layout_root->paint_box()->has_overflow())
-        m_content_size = page().enclosing_device_rect(layout_root->paint_box()->scrollable_overflow_rect().value()).size();
+    if (layout_root->paintable_box()->has_overflow())
+        m_content_size = page().enclosing_device_rect(layout_root->paintable_box()->scrollable_overflow_rect().value()).size();
     else
-        m_content_size = page().enclosing_device_rect(layout_root->paint_box()->absolute_rect()).size();
+        m_content_size = page().enclosing_device_rect(layout_root->paintable_box()->absolute_rect()).size();
     m_client.async_did_layout(m_content_size.to_type<int>());
 }