Changeset 285827 in webkit

Timestamp:

Nov 15, 2021, 1:18:03 PM (5 years ago)

Author:

Antti Koivisto

Message:

Revert r285235
​https://bugs.webkit.org/show_bug.cgi?id=233142

Unreviewed.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-backgrounds/parsing/border-radius-valid-expected.txt:

Source/WebCore:

Causes crash with simple repro

<div id=t style="border-radius: unset"></div>
<script>
t.style.borderRadius;
</script>

• css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue const):
(WebCore::StyleProperties::borderRadiusValue const): Deleted.

• css/StyleProperties.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleProperties.cpp (modified) (3 diffs)
• Source/WebCore/css/StyleProperties.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-11-15  Antti Koivisto  <antti@apple.com>
+
+        Revert r285235
+        https://bugs.webkit.org/show_bug.cgi?id=233142
+
+        Unreviewed.
+
+        * web-platform-tests/css/css-backgrounds/parsing/border-radius-valid-expected.txt:
+
 2021-11-15  Kiet Ho  <tho22@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid-expected.txt

@@ -4 +4 @@
 PASS e.style['border-radius'] = "1px 2% 3px" should set the property value
 PASS e.style['border-radius'] = "1px 2% 3px 4%" should set the property value
-PASS e.style['border-radius'] = "1px / 2px" should set the property value
-PASS e.style['border-radius'] = "5em / 1px 2% 3px 4%" should set the property value
-PASS e.style['border-radius'] = "1px 2% / 3px 4px" should set the property value
-PASS e.style['border-radius'] = "1px 2px 3em / 1px 2px 3%" should set the property value
-PASS e.style['border-radius'] = "1px 2% / 2px 3em 4px 5em" should set the property value
-PASS e.style['border-radius'] = "1px 2% 3px 4% / 5em" should set the property value
-PASS e.style['border-radius'] = "1px 1px 1px 2% / 1px 2% 1px 2%" should set the property value
-PASS e.style['border-radius'] = "1px 1px 1px 1px / 1px 1px 2% 1px" should set the property value
+FAIL e.style['border-radius'] = "1px / 2px" should set the property value assert_equals: serialization should be canonical expected "1px / 2px" but got "1px 2px"
+FAIL e.style['border-radius'] = "5em / 1px 2% 3px 4%" should set the property value assert_equals: serialization should be canonical expected "5em / 1px 2% 3px 4%" but got "5em 1px 5em 2% 5em 3px 5em 4%"
+FAIL e.style['border-radius'] = "1px 2% / 3px 4px" should set the property value assert_equals: serialization should be canonical expected "1px 2% / 3px 4px" but got "1px 3px 2% 4px"
+FAIL e.style['border-radius'] = "1px 2px 3em / 1px 2px 3%" should set the property value assert_equals: serialization should be canonical expected "1px 2px 3em / 1px 2px 3%" but got "1px 2px 3em 3%"
+FAIL e.style['border-radius'] = "1px 2% / 2px 3em 4px 5em" should set the property value assert_equals: serialization should be canonical expected "1px 2% / 2px 3em 4px 5em" but got "1px 2px 2% 3em 1px 4px 2% 5em"
+FAIL e.style['border-radius'] = "1px 2% 3px 4% / 5em" should set the property value assert_equals: serialization should be canonical expected "1px 2% 3px 4% / 5em" but got "1px 5em 2% 5em 3px 5em 4% 5em"
+FAIL e.style['border-radius'] = "1px 1px 1px 2% / 1px 2% 1px 2%" should set the property value assert_equals: serialization should be canonical expected "1px 1px 1px 2% / 1px 2%" but got "1px 1px 2% 1px 2%"
+FAIL e.style['border-radius'] = "1px 1px 1px 1px / 1px 1px 2% 1px" should set the property value assert_equals: serialization should be canonical expected "1px / 1px 1px 2%" but got "1px 1px 1px 2%"
 PASS e.style['border-radius'] = "1px 1px 2% 2%" should set the property value
 PASS e.style['border-radius'] = "1px 2% 1px 1px" should set the property value
-PASS e.style['border-radius'] = "1px 2% 2% 2% / 1px 2% 3px 2%" should set the property value
+FAIL e.style['border-radius'] = "1px 2% 2% 2% / 1px 2% 3px 2%" should set the property value assert_equals: serialization should be canonical expected "1px 2% 2% / 1px 2% 3px" but got "1px 2% 2% 3px"
 PASS e.style['border-top-left-radius'] = "10px" should set the property value
 PASS e.style['border-top-right-radius'] = "20%" should set the property value

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-15  Antti Koivisto  <antti@apple.com>
+
+        Revert r285235
+        https://bugs.webkit.org/show_bug.cgi?id=233142
+
+        Unreviewed.
+
+        Causes crash with simple repro
+
+        <div id=t style="border-radius: unset"></div>
+        <script>
+        t.style.borderRadius;
+        </script>
+
+        * css/StyleProperties.cpp:
+        (WebCore::StyleProperties::getPropertyValue const):
+        (WebCore::StyleProperties::borderRadiusValue const): Deleted.
+        * css/StyleProperties.h:
+
 2021-11-15  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/StyleProperties.cpp

@@ -36 +36 @@
 #include "Color.h"
 #include "Document.h"
-#include "Pair.h"
 #include "PropertySetCSSStyleDeclaration.h"
 #include "StylePropertyShorthand.h"
@@ -321 +320 @@
         return String();
     case CSSPropertyBorderRadius:
-        return borderRadiusValue(borderRadiusShorthand());
+        return get4Values(borderRadiusShorthand());
     case CSSPropertyGap:
         return get2Values(gapShorthand());
@@ -363 +362 @@
         return value->cssText();
     return String();
-}
-
-String StyleProperties::borderRadiusValue(const StylePropertyShorthand& shorthand) const
-{
-    auto serialize = [](const CSSValue* topLeft, const CSSValue* topRight, const CSSValue* bottomRight, const CSSValue* bottomLeft) -> String {
-        bool showBottomLeft = !(*topRight == *bottomLeft);
-        bool showBottomRight = !(*topLeft == *bottomRight) || showBottomLeft;
-        bool showTopRight = !(*topLeft == *topRight) || showBottomRight;
-
-        return makeString(topLeft->cssText(), showTopRight ? " " : "", showTopRight ? topRight->cssText() : "", showBottomRight ? " " : "", showBottomRight ? bottomRight->cssText() : "", showBottomLeft ? " " : "", showBottomLeft ? bottomLeft->cssText() : "");
-    };
-
-    int topLeftValueIndex = findPropertyIndex(shorthand.properties()[0]);
-    int topRightValueIndex = findPropertyIndex(shorthand.properties()[1]);
-    int bottomRightValueIndex = findPropertyIndex(shorthand.properties()[2]);
-    int bottomLeftValueIndex = findPropertyIndex(shorthand.properties()[3]);
-
-    if (topLeftValueIndex == -1 || topRightValueIndex == -1 || bottomRightValueIndex == -1 || bottomLeftValueIndex == -1)
-        return String();
-
-    PropertyReference topLeft = propertyAt(topLeftValueIndex);
-    PropertyReference topRight = propertyAt(topRightValueIndex);
-    PropertyReference bottomRight = propertyAt(bottomRightValueIndex);
-    PropertyReference bottomLeft = propertyAt(bottomLeftValueIndex);
-
-    auto* topLeftValue = topLeft.value();
-    auto* topRightValue = topRight.value();
-    auto* bottomRightValue = bottomRight.value();
-    auto* bottomLeftValue = bottomLeft.value();
-
-    // All 4 properties must be specified.
-    if (!topLeftValue || !topRightValue || !bottomRightValue || !bottomLeftValue)
-        return String();
-
-    // Important flags must be the same
-    if (topLeft.isImportant() != topRight.isImportant() || topRight.isImportant() != bottomRight.isImportant() || bottomRight.isImportant() != bottomLeft.isImportant())
-        return String();
-
-    if (topLeftValue->isInheritValue() && topRightValue->isInheritValue() && bottomRightValue->isInheritValue() && bottomLeftValue->isInheritValue())
-        return getValueName(CSSValueInherit);
-
-    if (topLeftValue->isInitialValue() || topRightValue->isInitialValue() || bottomRightValue->isInitialValue() || bottomLeftValue->isInitialValue()) {
-        if (topLeftValue->isInitialValue() && topRightValue->isInitialValue() && bottomRightValue->isInitialValue() && bottomLeftValue->isInitialValue() && !topLeft.isImplicit()) {
-            // All components are "initial" and "topLeft" is not implicit.
-            return getValueName(CSSValueInitial);
-        }
-        return String();
-    }
-
-    auto& topLeftPair = *downcast<CSSPrimitiveValue>(*topLeftValue).pairValue();
-    auto& topRightPair = *downcast<CSSPrimitiveValue>(*topRightValue).pairValue();
-    auto& bottomRightPair = *downcast<CSSPrimitiveValue>(*bottomRightValue).pairValue();
-    auto& bottomLeftPair = *downcast<CSSPrimitiveValue>(*bottomLeftValue).pairValue();
-
-    auto first = serialize(topLeftPair.first(), topRightPair.first(), bottomRightPair.first(), bottomLeftPair.first());
-    auto second = serialize(topLeftPair.second(), topRightPair.second(), bottomRightPair.second(), bottomLeftPair.second());
-    if (first == second)
-        return first;
-
-    return makeString(first, " / ", second);
 }
 

trunk/Source/WebCore/css/StyleProperties.h

@@ -171 +171 @@
     String get2Values(const StylePropertyShorthand&) const;
     String get4Values(const StylePropertyShorthand&) const;
-    String borderRadiusValue(const StylePropertyShorthand&) const;
     String borderSpacingValue(const StylePropertyShorthand&) const;
     String fontValue() const;