فهرست منبع

LibWeb: Fix ::-webkit-progress-bar/value pseudo elements

Recent changes to layout and display broke these pseudo elements
leading to crashes on a few websites such as https://rpcs3.net/.
MacDue 2 سال پیش
والد
کامیت
0265041d44
2فایلهای تغییر یافته به همراه14 افزوده شده و 7 حذف شده
  1. 2 3
      Userland/Libraries/LibWeb/HTML/HTMLProgressElement.cpp
  2. 12 4
      Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp

+ 2 - 3
Userland/Libraries/LibWeb/HTML/HTMLProgressElement.cpp

@@ -25,9 +25,8 @@ HTMLProgressElement::~HTMLProgressElement() = default;
 
 RefPtr<Layout::Node> HTMLProgressElement::create_layout_node(NonnullRefPtr<CSS::StyleProperties> style)
 {
-    if (style->appearance().value_or(CSS::Appearance::Auto) == CSS::Appearance::None) {
-        return adopt_ref(*new Layout::BlockContainer(document(), this, move(style)));
-    }
+    if (style->appearance().value_or(CSS::Appearance::Auto) == CSS::Appearance::None)
+        return HTMLElement::create_layout_node(style);
     return adopt_ref(*new Layout::Progress(document(), *this, move(style)));
 }
 

+ 12 - 4
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp

@@ -265,13 +265,21 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context&
         auto& progress = static_cast<HTML::HTMLProgressElement&>(dom_node);
         if (!progress.using_system_appearance()) {
             auto bar_style = style_computer.compute_style(progress, CSS::Selector::PseudoElement::ProgressBar);
+            bar_style->set_property(CSS::PropertyID::Display, CSS::IdentifierStyleValue::create(CSS::ValueID::InlineBlock));
             auto value_style = style_computer.compute_style(progress, CSS::Selector::PseudoElement::ProgressValue);
+            value_style->set_property(CSS::PropertyID::Display, CSS::IdentifierStyleValue::create(CSS::ValueID::Block));
             auto position = progress.position();
             value_style->set_property(CSS::PropertyID::Width, CSS::PercentageStyleValue::create(CSS::Percentage(position >= 0 ? round_to<int>(100 * position) : 0)));
-            auto progress_bar = adopt_ref(*new Layout::BlockContainer(document, nullptr, bar_style));
-            auto progress_value = adopt_ref(*new Layout::BlockContainer(document, nullptr, value_style));
-            progress_bar->append_child(*progress_value);
-            layout_node->append_child(*progress_bar);
+            auto bar_display = bar_style->display();
+            auto value_display = value_style->display();
+            auto progress_bar = DOM::Element::create_layout_node_for_display_type(document, bar_display, bar_style, nullptr);
+            auto progress_value = DOM::Element::create_layout_node_for_display_type(document, value_display, value_style, nullptr);
+            push_parent(verify_cast<NodeWithStyle>(*layout_node));
+            push_parent(verify_cast<NodeWithStyle>(*progress_bar));
+            insert_node_into_inline_or_block_ancestor(*progress_value, value_display, AppendOrPrepend::Append);
+            pop_parent();
+            insert_node_into_inline_or_block_ancestor(*progress_bar, bar_display, AppendOrPrepend::Append);
+            pop_parent();
             progress.set_pseudo_element_node({}, CSS::Selector::PseudoElement::ProgressBar, progress_bar);
             progress.set_pseudo_element_node({}, CSS::Selector::PseudoElement::ProgressValue, progress_value);
         }