We use cookies to ensure you get the best experience on our website
Inicio Explorar Ayuda
Registro Iniciar sesión
0ct0pu5
/
ladybird
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

LibWeb: Treat invalid StyleValues that included var() as `unset`

This means StyleComputer::resolve_unresolved_style_value() always
returns a value, so we can change its return type.

However, it does still return an UnresolvedStyleValue sometimes, so we
can't remove those checks from the user code.
Sam Atkins hace 1 año
padre
6b66e80fb8
commit
240ec9aeed
Se han modificado 5 ficheros con 28 adiciones y 21 borrados
Unificar vista Mostrar estadísticas de diff
  1. 5 0
      Tests/LibWeb/Ref/css-invalid-var-ref.html
  2. 6 0
      Tests/LibWeb/Ref/css-invalid-var.html
  3. 1 0
      Tests/LibWeb/Ref/manifest.json
  4. 15 20
      Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
  5. 1 1
      Userland/Libraries/LibWeb/CSS/StyleComputer.h

+ 5 - 0
Tests/LibWeb/Ref/css-invalid-var-ref.html
Ver fichero 

@@ -0,0 +1,5 @@
 
+<!doctype html><style>
 
+    div {
 
+        color: black;
 
+    }
 
+</style><div>This text should be black.

+ 6 - 0
Tests/LibWeb/Ref/css-invalid-var.html
Ver fichero 

@@ -0,0 +1,6 @@
 
+<!doctype html><style>
 
+    div {
 
+        color: red;
 
+        color: var(--wat);
 
+    }
 
+</style><div>This text should be black.

+ 1 - 0
Tests/LibWeb/Ref/manifest.json
Ver fichero 

@@ -3,6 +3,7 @@
 
     "css-any-link-selector.html": "css-any-link-selector-ref.html",
 
     "css-any-link-selector.html": "css-any-link-selector-ref.html",
 
     "css-gradient-currentcolor.html": "css-gradient-currentcolor-ref.html",
 
     "css-gradient-currentcolor.html": "css-gradient-currentcolor-ref.html",
 
     "css-gradients.html": "css-gradients-ref.html",
 
     "css-gradients.html": "css-gradients-ref.html",
 
+    "css-invalid-var.html": "css-invalid-var-ref.html",
 
     "css-lang-selector.html": "css-lang-selector-ref.html",
 
     "css-lang-selector.html": "css-lang-selector-ref.html",
 
     "css-local-link-selector.html": "css-local-link-selector-ref.html",
 
     "css-local-link-selector.html": "css-local-link-selector-ref.html",
 
     "css-placeholder-shown-selector.html": "css-placeholder-shown-selector-ref.html",
 
     "css-placeholder-shown-selector.html": "css-placeholder-shown-selector-ref.html",

+ 15 - 20
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
Ver fichero 

@@ -64,6 +64,7 @@
 
 #include <LibWeb/CSS/StyleValues/TimeStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/TimeStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/TransformationStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/TransformationStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h>
 
 #include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h>
 
+#include <LibWeb/CSS/StyleValues/UnsetStyleValue.h>
 
 #include <LibWeb/DOM/Document.h>
 
 #include <LibWeb/DOM/Document.h>
 
 #include <LibWeb/DOM/Element.h>
 
 #include <LibWeb/DOM/Element.h>
 
 #include <LibWeb/FontCache.h>
 
 #include <LibWeb/FontCache.h>
 
@@ -940,10 +941,8 @@ void StyleComputer::set_all_properties(DOM::Element& element, Optional<CSS::Sele
 
         }
 
         }
 
 
 
         NonnullRefPtr<StyleValue> property_value = value;
 
         NonnullRefPtr<StyleValue> property_value = value;
 
-        if (property_value->is_unresolved()) {
 
-            if (auto resolved = resolve_unresolved_style_value(element, pseudo_element, property_id, property_value->as_unresolved()))
 
-                property_value = resolved.release_nonnull();
 
-        }
 
+        if (property_value->is_unresolved())
 
+            property_value = resolve_unresolved_style_value(element, pseudo_element, property_id, property_value->as_unresolved());
 
         if (!property_value->is_unresolved())
 
         if (!property_value->is_unresolved())
 
             set_property_expanding_shorthands(style, property_id, property_value, document, declaration, properties_for_revert);
 
             set_property_expanding_shorthands(style, property_id, property_value, document, declaration, properties_for_revert);
 
 
 
@@ -1161,28 +1160,30 @@ bool StyleComputer::expand_unresolved_values(DOM::Element& element, StringView p
 
     return true;
 
     return true;
 
 }
 
 }
 
 
 
-RefPtr<StyleValue> StyleComputer::resolve_unresolved_style_value(DOM::Element& element, Optional<CSS::Selector::PseudoElement> pseudo_element, PropertyID property_id, UnresolvedStyleValue const& unresolved) const
 
+NonnullRefPtr<StyleValue> StyleComputer::resolve_unresolved_style_value(DOM::Element& element, Optional<CSS::Selector::PseudoElement> pseudo_element, PropertyID property_id, UnresolvedStyleValue const& unresolved) const
 
 {
 
 {
 
     // Unresolved always contains a var() or attr(), unless it is a custom property's value, in which case we shouldn't be trying
 
     // Unresolved always contains a var() or attr(), unless it is a custom property's value, in which case we shouldn't be trying
 
     // to produce a different StyleValue from it.
 
     // to produce a different StyleValue from it.
 
     VERIFY(unresolved.contains_var_or_attr());
 
     VERIFY(unresolved.contains_var_or_attr());
 
 
 
+    // If the value is invalid, we fall back to `unset`: https://www.w3.org/TR/css-variables-1/#invalid-at-computed-value-time
 
+
 
     Parser::TokenStream unresolved_values_without_variables_expanded { unresolved.values() };
 
     Parser::TokenStream unresolved_values_without_variables_expanded { unresolved.values() };
 
     Vector<Parser::ComponentValue> values_with_variables_expanded;
 
     Vector<Parser::ComponentValue> values_with_variables_expanded;
 
 
 
     HashMap<FlyString, NonnullRefPtr<PropertyDependencyNode>> dependencies;
 
     HashMap<FlyString, NonnullRefPtr<PropertyDependencyNode>> dependencies;
 
     if (!expand_variables(element, pseudo_element, string_from_property_id(property_id), dependencies, unresolved_values_without_variables_expanded, values_with_variables_expanded))
 
     if (!expand_variables(element, pseudo_element, string_from_property_id(property_id), dependencies, unresolved_values_without_variables_expanded, values_with_variables_expanded))
 
-        return {};
 
+        return UnsetStyleValue::the();
 
 
 
     Parser::TokenStream unresolved_values_with_variables_expanded { values_with_variables_expanded };
 
     Parser::TokenStream unresolved_values_with_variables_expanded { values_with_variables_expanded };
 
     Vector<Parser::ComponentValue> expanded_values;
 
     Vector<Parser::ComponentValue> expanded_values;
 
     if (!expand_unresolved_values(element, string_from_property_id(property_id), unresolved_values_with_variables_expanded, expanded_values))
 
     if (!expand_unresolved_values(element, string_from_property_id(property_id), unresolved_values_with_variables_expanded, expanded_values))
 
-        return {};
 
+        return UnsetStyleValue::the();
 
 
 
     if (auto parsed_value = Parser::Parser::parse_css_value({}, Parser::ParsingContext { document() }, property_id, expanded_values))
 
     if (auto parsed_value = Parser::Parser::parse_css_value({}, Parser::ParsingContext { document() }, property_id, expanded_values))
 
         return parsed_value.release_nonnull();
 
         return parsed_value.release_nonnull();
 
 
 
-    return {};
 
+    return UnsetStyleValue::the();
 
 }
 
 }
 
 
 
 void StyleComputer::cascade_declarations(StyleProperties& style, DOM::Element& element, Optional<CSS::Selector::PseudoElement> pseudo_element, Vector<MatchingRule> const& matching_rules, CascadeOrigin cascade_origin, Important important) const
 
 void StyleComputer::cascade_declarations(StyleProperties& style, DOM::Element& element, Optional<CSS::Selector::PseudoElement> pseudo_element, Vector<MatchingRule> const& matching_rules, CascadeOrigin cascade_origin, Important important) const
 
@@ -1200,10 +1201,8 @@ void StyleComputer::cascade_declarations(StyleProperties& style, DOM::Element& e
 
             }
 
             }
 
 
 
             auto property_value = property.value;
 
             auto property_value = property.value;
 
-            if (property.value->is_unresolved()) {
 
-                if (auto resolved = resolve_unresolved_style_value(element, pseudo_element, property.property_id, property.value->as_unresolved()))
 
-                    property_value = resolved.release_nonnull();
 
-            }
 
+            if (property.value->is_unresolved())
 
+                property_value = resolve_unresolved_style_value(element, pseudo_element, property.property_id, property.value->as_unresolved());
 
             if (!property_value->is_unresolved())
 
             if (!property_value->is_unresolved())
 
                 set_property_expanding_shorthands(style, property.property_id, property_value, m_document, &match.rule->declaration(), properties_for_revert);
 
                 set_property_expanding_shorthands(style, property.property_id, property_value, m_document, &match.rule->declaration(), properties_for_revert);
 
         }
 
         }
 
@@ -1221,10 +1220,8 @@ void StyleComputer::cascade_declarations(StyleProperties& style, DOM::Element& e
 
                 }
 
                 }
 
 
 
                 auto property_value = property.value;
 
                 auto property_value = property.value;
 
-                if (property.value->is_unresolved()) {
 
-                    if (auto resolved = resolve_unresolved_style_value(element, pseudo_element, property.property_id, property.value->as_unresolved()))
 
-                        property_value = resolved.release_nonnull();
 
-                }
 
+                if (property.value->is_unresolved())
 
+                    property_value = resolve_unresolved_style_value(element, pseudo_element, property.property_id, property.value->as_unresolved());
 
                 if (!property_value->is_unresolved())
 
                 if (!property_value->is_unresolved())
 
                     set_property_expanding_shorthands(style, property.property_id, property_value, m_document, inline_style, properties_for_revert);
 
                     set_property_expanding_shorthands(style, property.property_id, property_value, m_document, inline_style, properties_for_revert);
 
             }
 
             }
 
@@ -1769,10 +1766,8 @@ ErrorOr<void> StyleComputer::compute_cascaded_values(StyleProperties& style, DOM
 
             for (auto i = to_underlying(CSS::first_property_id); i <= to_underlying(CSS::last_property_id); ++i) {
 
             for (auto i = to_underlying(CSS::first_property_id); i <= to_underlying(CSS::last_property_id); ++i) {
 
                 auto property_id = (CSS::PropertyID)i;
 
                 auto property_id = (CSS::PropertyID)i;
 
                 auto& property = style.m_property_values[i];
 
                 auto& property = style.m_property_values[i];
 
-                if (property.has_value() && property->style->is_unresolved()) {
 
-                    if (auto resolved = resolve_unresolved_style_value(element, pseudo_element, property_id, property->style->as_unresolved()))
 
-                        property->style = resolved.release_nonnull();
 
-                }
 
+                if (property.has_value() && property->style->is_unresolved())
 
+                    property->style = resolve_unresolved_style_value(element, pseudo_element, property_id, property->style->as_unresolved());
 
             }
 
             }
 
         }
 
         }
 
     }
 
     }

+ 1 - 1
Userland/Libraries/LibWeb/CSS/StyleComputer.h
Ver fichero 

@@ -153,7 +153,7 @@ private:
 
 
 
     void compute_defaulted_property_value(StyleProperties&, DOM::Element const*, CSS::PropertyID, Optional<CSS::Selector::PseudoElement>) const;
 
     void compute_defaulted_property_value(StyleProperties&, DOM::Element const*, CSS::PropertyID, Optional<CSS::Selector::PseudoElement>) const;
 
 
 
-    RefPtr<StyleValue> resolve_unresolved_style_value(DOM::Element&, Optional<CSS::Selector::PseudoElement>, PropertyID, UnresolvedStyleValue const&) const;
 
+    NonnullRefPtr<StyleValue> resolve_unresolved_style_value(DOM::Element&, Optional<CSS::Selector::PseudoElement>, PropertyID, UnresolvedStyleValue const&) const;
 
     bool expand_variables(DOM::Element&, Optional<CSS::Selector::PseudoElement>, StringView property_name, HashMap<FlyString, NonnullRefPtr<PropertyDependencyNode>>& dependencies, Parser::TokenStream<Parser::ComponentValue>& source, Vector<Parser::ComponentValue>& dest) const;
 
     bool expand_variables(DOM::Element&, Optional<CSS::Selector::PseudoElement>, StringView property_name, HashMap<FlyString, NonnullRefPtr<PropertyDependencyNode>>& dependencies, Parser::TokenStream<Parser::ComponentValue>& source, Vector<Parser::ComponentValue>& dest) const;
 
     bool expand_unresolved_values(DOM::Element&, StringView property_name, Parser::TokenStream<Parser::ComponentValue>& source, Vector<Parser::ComponentValue>& dest) const;
 
     bool expand_unresolved_values(DOM::Element&, StringView property_name, Parser::TokenStream<Parser::ComponentValue>& source, Vector<Parser::ComponentValue>& dest) const;

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5