LibWeb: Make DOM::Node::create_layout_node() not need parent's style

The StyleResolver can find the specified CSS values for the parent
element via the DOM. Forcing everyone to locate specified values for
their parent was completely unnecessary.

Libraries/LibWeb/CSS/StyleResolver.cpp

@@ -564,11 +564,11 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
     style.set_property(property_id, value);
 }
 
-NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const DOM::Element& element, const StyleProperties* parent_style) const
+NonnullRefPtr<StyleProperties> StyleResolver::resolve_style(const DOM::Element& element) const
 {
     auto style = StyleProperties::create();
 
-    if (parent_style) {
+    if (auto* parent_style = element.parent_element() ? element.parent_element()->specified_css_values() : nullptr) {
         parent_style->for_each_property([&](auto property_id, auto& value) {
             if (is_inherited_property(property_id))
                 set_property_expanding_shorthands(style, property_id, value, m_document);

Libraries/LibWeb/CSS/StyleResolver.h

@@ -48,7 +48,7 @@ public:
     DOM::Document& document() { return m_document; }
     const DOM::Document& document() const { return m_document; }
 
-    NonnullRefPtr<StyleProperties> resolve_style(const DOM::Element&, const StyleProperties* parent_style) const;
+    NonnullRefPtr<StyleProperties> resolve_style(const DOM::Element&) const;
 
     Vector<MatchingRule> collect_matching_rules(const DOM::Element&) const;
     void sort_matching_rules(Vector<MatchingRule>&) const;

Libraries/LibWeb/DOM/Document.cpp

@@ -408,7 +408,7 @@ void Document::update_style()
     update_layout();
 }
 
-RefPtr<Layout::Node> Document::create_layout_node(const CSS::StyleProperties*)
+RefPtr<Layout::Node> Document::create_layout_node()
 {
     return adopt(*new Layout::InitialContainingBlockBox(*this, CSS::StyleProperties::create()));
 }

Libraries/LibWeb/DOM/Document.h

@@ -223,7 +223,7 @@ public:
 private:
     explicit Document(const URL&);
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     void tear_down_layout_tree();
 

Libraries/LibWeb/DOM/Element.cpp

@@ -111,9 +111,9 @@ bool Element::has_class(const FlyString& class_name) const
     return false;
 }
 
-RefPtr<Layout::Node> Element::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> Element::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     const_cast<Element&>(*this).m_specified_css_values = style;
     auto display = style->display();
 
@@ -199,8 +199,7 @@ void Element::recompute_style()
     set_needs_style_update(false);
     ASSERT(parent());
     auto old_specified_css_values = m_specified_css_values;
-    auto* parent_specified_css_values = parent()->is_element() ? downcast<Element>(*parent()).specified_css_values() : nullptr;
+    auto new_specified_css_values = document().style_resolver().resolve_style(*this);
-    auto new_specified_css_values = document().style_resolver().resolve_style(*this, parent_specified_css_values);
     m_specified_css_values = new_specified_css_values;
     if (!layout_node()) {
         if (new_specified_css_values->display() == CSS::Display::None)

Libraries/LibWeb/DOM/Element.h

@@ -99,7 +99,7 @@ public:
     virtual bool is_focusable() const { return false; }
 
 protected:
-    RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    RefPtr<Layout::Node> create_layout_node() override;
 
 private:
     Attribute* find_attribute(const FlyString& name);

Libraries/LibWeb/DOM/Node.cpp

@@ -105,7 +105,7 @@ void Node::set_text_content(const String& content)
     document().invalidate_layout();
 }
 
-RefPtr<Layout::Node> Node::create_layout_node(const CSS::StyleProperties*)
+RefPtr<Layout::Node> Node::create_layout_node()
 {
     return nullptr;
 }

Libraries/LibWeb/DOM/Node.h

@@ -84,7 +84,7 @@ public:
     RefPtr<Node> insert_before(NonnullRefPtr<Node> node, RefPtr<Node> child, bool notify = true);
     void remove_all_children();
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style);
+    virtual RefPtr<Layout::Node> create_layout_node();
 
     virtual FlyString node_name() const = 0;
 

Libraries/LibWeb/DOM/Text.cpp

@@ -38,7 +38,7 @@ Text::~Text()
 {
 }
 
-RefPtr<Layout::Node> Text::create_layout_node(const CSS::StyleProperties*)
+RefPtr<Layout::Node> Text::create_layout_node()
 {
     return adopt(*new Layout::TextNode(document(), *this));
 }

Libraries/LibWeb/DOM/Text.h

@@ -42,7 +42,7 @@ public:
     virtual FlyString node_name() const override { return "#text"; }
 
 private:
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 };
 
 }

Libraries/LibWeb/HTML/HTMLBRElement.cpp

@@ -38,7 +38,7 @@ HTMLBRElement::~HTMLBRElement()
 {
 }
 
-RefPtr<Layout::Node> HTMLBRElement::create_layout_node(const CSS::StyleProperties*)
+RefPtr<Layout::Node> HTMLBRElement::create_layout_node()
 {
     return adopt(*new Layout::BreakNode(document(), *this));
 }

Libraries/LibWeb/HTML/HTMLBRElement.h

@@ -37,7 +37,7 @@ public:
     HTMLBRElement(DOM::Document&, const QualifiedName& qualified_name);
     virtual ~HTMLBRElement() override;
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 };
 
 }

Libraries/LibWeb/HTML/HTMLCanvasElement.cpp

@@ -55,9 +55,9 @@ unsigned HTMLCanvasElement::height() const
     return attribute(HTML::AttributeNames::height).to_uint().value_or(150);
 }
 
-RefPtr<Layout::Node> HTMLCanvasElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> HTMLCanvasElement::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
     return adopt(*new Layout::CanvasBox(document(), *this, move(style)));

Libraries/LibWeb/HTML/HTMLCanvasElement.h

@@ -49,7 +49,7 @@ public:
     unsigned height() const;
 
 private:
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     RefPtr<Gfx::Bitmap> m_bitmap;
     RefPtr<CanvasRenderingContext2D> m_context;

Libraries/LibWeb/HTML/HTMLIFrameElement.cpp

@@ -54,9 +54,9 @@ HTMLIFrameElement::~HTMLIFrameElement()
 {
 }
 
-RefPtr<Layout::Node> HTMLIFrameElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> HTMLIFrameElement::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     return adopt(*new Layout::FrameBox(document(), *this, move(style)));
 }
 

Libraries/LibWeb/HTML/HTMLIFrameElement.h

@@ -37,7 +37,7 @@ public:
     HTMLIFrameElement(DOM::Document&, const QualifiedName& qualified_name);
     virtual ~HTMLIFrameElement() override;
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     Frame* content_frame() { return m_content_frame; }
     const Frame* content_frame() const { return m_content_frame; }

Libraries/LibWeb/HTML/HTMLImageElement.cpp

@@ -84,9 +84,9 @@ void HTMLImageElement::parse_attribute(const FlyString& name, const String& valu
         m_image_loader.load(document().complete_url(value));
 }
 
-RefPtr<Layout::Node> HTMLImageElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> HTMLImageElement::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
     return adopt(*new Layout::ImageBox(document(), *this, move(style), m_image_loader));

Libraries/LibWeb/HTML/HTMLImageElement.h

@@ -53,7 +53,7 @@ private:
 
     void animate();
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     ImageLoader m_image_loader;
 };

Libraries/LibWeb/HTML/HTMLInputElement.cpp

@@ -62,7 +62,7 @@ void HTMLInputElement::did_click_button(Badge<Layout::ButtonBox>)
     }
 }
 
-RefPtr<Layout::Node> HTMLInputElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> HTMLInputElement::create_layout_node()
 {
     ASSERT(document().page());
     auto& page = *document().page();
@@ -71,7 +71,7 @@ RefPtr<Layout::Node> HTMLInputElement::create_layout_node(const CSS::StyleProper
     if (type() == "hidden")
         return nullptr;
 
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
 

Libraries/LibWeb/HTML/HTMLInputElement.h

@@ -37,7 +37,7 @@ public:
     HTMLInputElement(DOM::Document&, const QualifiedName& qualified_name);
     virtual ~HTMLInputElement() override;
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     String type() const { return attribute(HTML::AttributeNames::type); }
     String value() const { return attribute(HTML::AttributeNames::value); }

Libraries/LibWeb/HTML/HTMLObjectElement.cpp

@@ -61,12 +61,12 @@ void HTMLObjectElement::parse_attribute(const FlyString& name, const String& val
         m_image_loader.load(document().complete_url(value));
 }
 
-RefPtr<Layout::Node> HTMLObjectElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> HTMLObjectElement::create_layout_node()
 {
     if (m_should_show_fallback_content)
-        return HTMLElement::create_layout_node(parent_style);
+        return HTMLElement::create_layout_node();
 
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
     if (m_image_loader.has_image())

Libraries/LibWeb/HTML/HTMLObjectElement.h

@@ -46,7 +46,7 @@ public:
     String type() const { return attribute(HTML::AttributeNames::type); }
 
 private:
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     ImageLoader m_image_loader;
     bool m_should_show_fallback_content { false };

Libraries/LibWeb/Layout/Node.cpp

@@ -26,6 +26,7 @@
 
 #include <AK/Demangle.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/FontDatabase.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/Dump.h>
@@ -215,6 +216,7 @@ NodeWithStyle::NodeWithStyle(DOM::Document& document, DOM::Node* node, CSS::Comp
     , m_computed_values(move(computed_values))
 {
     m_has_style = true;
+    m_font = Gfx::FontDatabase::default_font();
 }
 
 void NodeWithStyle::apply_style(const CSS::StyleProperties& specified_style)

Libraries/LibWeb/Layout/TreeBuilder.cpp

@@ -95,7 +95,7 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node)
     if (!m_parent_stack.is_empty() && m_parent_stack.last()->dom_node() && m_parent_stack.last()->dom_node()->is_element())
         parent_style = downcast<DOM::Element>(*m_parent_stack.last()->dom_node()).specified_css_values();
 
-    auto layout_node = dom_node.create_layout_node(parent_style);
+    auto layout_node = dom_node.create_layout_node();
     if (!layout_node)
         return;
 

Libraries/LibWeb/SVG/SVGPathElement.cpp

@@ -430,9 +430,9 @@ SVGPathElement::SVGPathElement(DOM::Document& document, const QualifiedName& qua
 {
 }
 
-RefPtr<Layout::Node> SVGPathElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> SVGPathElement::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
     return adopt(*new Layout::SVGPathBox(document(), *this, move(style)));

Libraries/LibWeb/SVG/SVGPathElement.h

@@ -109,7 +109,7 @@ public:
     SVGPathElement(DOM::Document&, const QualifiedName& qualified_name);
     virtual ~SVGPathElement() override = default;
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     virtual void parse_attribute(const FlyString& name, const String& value) override;
 

Libraries/LibWeb/SVG/SVGSVGElement.cpp

@@ -40,9 +40,9 @@ SVGSVGElement::SVGSVGElement(DOM::Document& document, const QualifiedName& quali
 {
 }
 
-RefPtr<Layout::Node> SVGSVGElement::create_layout_node(const CSS::StyleProperties* parent_style)
+RefPtr<Layout::Node> SVGSVGElement::create_layout_node()
 {
-    auto style = document().style_resolver().resolve_style(*this, parent_style);
+    auto style = document().style_resolver().resolve_style(*this);
     if (style->display() == CSS::Display::None)
         return nullptr;
     return adopt(*new Layout::SVGSVGBox(document(), *this, move(style)));

Libraries/LibWeb/SVG/SVGSVGElement.h

@@ -37,7 +37,7 @@ public:
 
     SVGSVGElement(DOM::Document&, const QualifiedName& qualified_name);
 
-    virtual RefPtr<Layout::Node> create_layout_node(const CSS::StyleProperties* parent_style) override;
+    virtual RefPtr<Layout::Node> create_layout_node() override;
 
     unsigned width() const;
     unsigned height() const;