Pārlūkot izejas kodu

LibWeb: Implement "out-of-flow" property of Layout Box

In some situations, a layout box should not participate in the standard
layout process, for example when set to `position: absolute`.
Sam Atkins 3 gadi atpakaļ
vecāks
revīzija
2844f89a83

+ 25 - 0
Userland/Libraries/LibWeb/Layout/Box.cpp

@@ -1,5 +1,6 @@
 /*
 /*
  * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
  * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Sam Atkins <atkinssj@serenityos.org>
  *
  *
  * SPDX-License-Identifier: BSD-2-Clause
  * SPDX-License-Identifier: BSD-2-Clause
  */
  */
@@ -12,6 +13,7 @@
 #include <LibWeb/HTML/HTMLHtmlElement.h>
 #include <LibWeb/HTML/HTMLHtmlElement.h>
 #include <LibWeb/Layout/BlockBox.h>
 #include <LibWeb/Layout/BlockBox.h>
 #include <LibWeb/Layout/Box.h>
 #include <LibWeb/Layout/Box.h>
+#include <LibWeb/Layout/FormattingContext.h>
 #include <LibWeb/Page/BrowsingContext.h>
 #include <LibWeb/Page/BrowsingContext.h>
 #include <LibWeb/Painting/BorderPainting.h>
 #include <LibWeb/Painting/BorderPainting.h>
 
 
@@ -317,6 +319,29 @@ Box::BorderRadiusData Box::normalized_border_radius_data()
     return { (int)top_left_radius, (int)top_right_radius, (int)bottom_right_radius, (int)bottom_left_radius };
     return { (int)top_left_radius, (int)top_right_radius, (int)bottom_right_radius, (int)bottom_left_radius };
 }
 }
 
 
+// https://www.w3.org/TR/css-display-3/#out-of-flow
+bool Box::is_out_of_flow(FormattingContext const& formatting_context) const
+{
+    // A box is out of flow if either:
+
+    // 1. It is floated (which requires that floating is not inhibited).
+    if (!formatting_context.inhibits_floating() && computed_values().float_() != CSS::Float::None)
+        return true;
+
+    // 2. It is "absolutely positioned".
+    switch (computed_values().position()) {
+    case CSS::Position::Absolute:
+    case CSS::Position::Fixed:
+        return true;
+    case CSS::Position::Static:
+    case CSS::Position::Relative:
+    case CSS::Position::Sticky:
+        break;
+    }
+
+    return false;
+}
+
 HitTestResult Box::hit_test(const Gfx::IntPoint& position, HitTestType type) const
 HitTestResult Box::hit_test(const Gfx::IntPoint& position, HitTestType type) const
 {
 {
     // FIXME: It would be nice if we could confidently skip over hit testing
     // FIXME: It would be nice if we could confidently skip over hit testing

+ 2 - 0
Userland/Libraries/LibWeb/Layout/Box.h

@@ -97,6 +97,8 @@ public:
     float absolute_y() const { return absolute_rect().y(); }
     float absolute_y() const { return absolute_rect().y(); }
     Gfx::FloatPoint absolute_position() const { return absolute_rect().location(); }
     Gfx::FloatPoint absolute_position() const { return absolute_rect().location(); }
 
 
+    bool is_out_of_flow(FormattingContext const&) const;
+
     virtual HitTestResult hit_test(const Gfx::IntPoint&, HitTestType) const override;
     virtual HitTestResult hit_test(const Gfx::IntPoint&, HitTestType) const override;
     virtual void set_needs_display() override;
     virtual void set_needs_display() override;
 
 

+ 2 - 0
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h

@@ -15,6 +15,8 @@ public:
     FlexFormattingContext(Box& containing_block, FormattingContext* parent);
     FlexFormattingContext(Box& containing_block, FormattingContext* parent);
     ~FlexFormattingContext();
     ~FlexFormattingContext();
 
 
+    virtual bool inhibits_floating() const override { return true; }
+
     virtual void run(Box&, LayoutMode) override;
     virtual void run(Box&, LayoutMode) override;
 };
 };
 
 

+ 1 - 0
Userland/Libraries/LibWeb/Layout/FormattingContext.h

@@ -21,6 +21,7 @@ public:
     const FormattingContext* parent() const { return m_parent; }
     const FormattingContext* parent() const { return m_parent; }
 
 
     virtual bool is_block_formatting_context() const { return false; }
     virtual bool is_block_formatting_context() const { return false; }
+    virtual bool inhibits_floating() const { return false; }
 
 
     static bool creates_block_formatting_context(const Box&);
     static bool creates_block_formatting_context(const Box&);