Stop returning nullptr for system font keywords on non-font related properties

chirags27 · nt1m · commit db5cab0a4aaa · 2023-01-10T13:29:37.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250245 rdar://103916548 Reviewed by Darin Adler and Tim Nguyen. The code that is handling font: menu shouldn’t apply to non-font properties. * LayoutTests/fast/css/css-text-border-menu-expected.txt: Added. * LayoutTests/fast/css/css-text-border-menu.html: Added. * Source/WebCore/css/StyleProperties.cpp: (WebCore::StyleProperties::getPropertyCSSValue const): Canonical link: https://commits.webkit.org/258742@main
diff --git a/LayoutTests/fast/css/css-text-border-menu-expected.txt b/LayoutTests/fast/css/css-text-border-menu-expected.txt
@@ -0,0 +1 @@
+PASS if no crash
diff --git a/LayoutTests/fast/css/css-text-border-menu.html b/LayoutTests/fast/css/css-text-border-menu.html
@@ -0,0 +1,12 @@
+<script>
+function test() {
+    if (window.testRunner)
+        testRunner.dumpAsText();
+    const div = document.createElement("div");
+    const elementStyle = div.style;
+    elementStyle.border = "menu";
+    cssText = elementStyle.cssText;
+}
+</script>
+<body onload="test()">
+<p>PASS if no crash</p>
diff --git a/Source/WebCore/css/StyleProperties.cpp b/Source/WebCore/css/StyleProperties.cpp
@@ -1139,7 +1139,7 @@ RefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID)
     auto value = property.value();
     // System fonts are represented as CSSPrimitiveValue for various font subproperties, but these must serialize as the empty string.
     // It might be better to implement this as a special CSSValue type instead of turning them into null here.
-    if (property.id() != CSSPropertyFont && CSSPropertyParserHelpers::isSystemFontShorthand(valueID(value)))
+    if (property.shorthandID() == CSSPropertyFont && CSSPropertyParserHelpers::isSystemFontShorthand(valueID(value)))
         return nullptr;
     return value;
 }

Original file line number	Diff line number	Diff line change
`@@ -1139,7 +1139,7 @@ RefPtr<CSSValue> StyleProperties::getPropertyCSSValue(CSSPropertyID propertyID)`
`1139`	`1139`	`auto value = property.value();`
`1140`	`1140`	`// System fonts are represented as CSSPrimitiveValue for various font subproperties, but these must serialize as the empty string.`
`1141`	`1141`	`// It might be better to implement this as a special CSSValue type instead of turning them into null here.`
`1142`		`- if (property.id() != CSSPropertyFont && CSSPropertyParserHelpers::isSystemFontShorthand(valueID(value)))`
	`1142`	`+ if (property.shorthandID() == CSSPropertyFont && CSSPropertyParserHelpers::isSystemFontShorthand(valueID(value)))`
`1143`	`1143`	`return nullptr;`
`1144`	`1144`	`return value;`
`1145`	`1145`	`}`