Expose operator lighter in SVGFECompositeElement IDL

nullhook · nullhook · commit 89a77dce2e2a · 2025-12-25T19:08:06.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=304105 rdar://problem/166704079 Reviewed by Said Abou-Hallawa. As defined in the Compositing and Blending spec [1], the 'lighter' operator is specified. This PR, as discussed in [2], exposes the 'lighter' value to IDL. [1] https://www.w3.org/TR/compositing-1/#porterduffcompositingoperators_plus [2] w3c/svgwg#424 * LayoutTests/imported/w3c/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt: * LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt: Removed. * LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement.html: Removed. Removed this test because it is duplicated in WPT. * Source/WebCore/svg/SVGFECompositeElement.h: (WebCore::SVGIDLEnumLimits<CompositeOperationType>::highestExposedEnumValue): Deleted. * Source/WebCore/svg/SVGFECompositeElement.idl: * Source/WebCore/svg/properties/SVGDecoratedEnumeration.h: * Source/WebCore/svg/properties/SVGPropertyTraits.h: (WebCore::SVGIDLEnumLimits::highestExposedEnumValue): Deleted. Canonical link: https://commits.webkit.org/304941@main
diff --git a/LayoutTests/imported/w3c/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt
@@ -1,3 +1,3 @@
 
-FAIL Use of SVGAnimatedEnumeration within SVGFECompositeElement Type error
+PASS Use of SVGAnimatedEnumeration within SVGFECompositeElement
 
diff --git a/LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt b/LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement-expected.txt
diff --git a/LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement.html b/LayoutTests/svg/dom/SVGAnimatedEnumeration-SVGFECompositeElement.html
diff --git a/Source/WebCore/svg/SVGFECompositeElement.h b/Source/WebCore/svg/SVGFECompositeElement.h
@@ -29,9 +29,6 @@
 
 namespace WebCore {
 
-template<>
-inline unsigned SVGIDLEnumLimits<CompositeOperationType>::highestExposedEnumValue() { return enumToUnderlyingType(CompositeOperationType::FECOMPOSITE_OPERATOR_ARITHMETIC); }
-
 template<>
 struct SVGPropertyTraits<CompositeOperationType> {
     static unsigned highestEnumValue() { return enumToUnderlyingType(CompositeOperationType::FECOMPOSITE_OPERATOR_LIGHTER); }
diff --git a/Source/WebCore/svg/SVGFECompositeElement.idl b/Source/WebCore/svg/SVGFECompositeElement.idl
@@ -35,6 +35,7 @@
     const unsigned short SVG_FECOMPOSITE_OPERATOR_ATOP       = 4;
     const unsigned short SVG_FECOMPOSITE_OPERATOR_XOR        = 5;
     const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
+    const unsigned short SVG_FECOMPOSITE_OPERATOR_LIGHTER    = 7;
 
     readonly attribute SVGAnimatedString      in1;
     readonly attribute SVGAnimatedString      in2;
diff --git a/Source/WebCore/svg/properties/SVGDecoratedEnumeration.h b/Source/WebCore/svg/properties/SVGDecoratedEnumeration.h
@@ -45,15 +45,15 @@ class SVGDecoratedEnumeration : public SVGDecoratedPrimitive<DecorationType, Enu
 private:
     bool setValue(const DecorationType& value) override
     {
-        if (!value || value > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())
+        if (!value || value > SVGPropertyTraits<EnumType>::highestEnumValue())
             return false;
         Base::setValueInternal(value);
         return true;
     }
 
     DecorationType value() const override
     {
-        if (Base::value() > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())
+        if (Base::value() > SVGPropertyTraits<EnumType>::highestEnumValue())
             return m_outOfRangeEnumValue;
         return Base::value();
     }
diff --git a/Source/WebCore/svg/properties/SVGPropertyTraits.h b/Source/WebCore/svg/properties/SVGPropertyTraits.h
@@ -152,10 +152,4 @@ struct SVGPropertyTraits<String> {
     static String toString(const String& string) { return string; }
 };
 
-template<typename EnumType>
-struct SVGIDLEnumLimits {
-    // Specialize this function for a particular enumeration to limit the values that are exposed through the DOM.
-    static unsigned highestExposedEnumValue() { return SVGPropertyTraits<EnumType>::highestEnumValue(); }
-};
-
 } // namespace WebCore

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`		`-FAIL Use of SVGAnimatedEnumeration within SVGFECompositeElement Type error`
	`2`	`+PASS Use of SVGAnimatedEnumeration within SVGFECompositeElement`
`3`	`3`
Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,15 @@ class SVGDecoratedEnumeration : public SVGDecoratedPrimitive<DecorationType, Enu`
`45`	`45`	`private:`
`46`	`46`	`bool setValue(const DecorationType& value) override`
`47`	`47`	`{`
`48`		`- if (!value \|\| value > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())`
	`48`	`+ if (!value \|\| value > SVGPropertyTraits<EnumType>::highestEnumValue())`
`49`	`49`	`return false;`
`50`	`50`	`Base::setValueInternal(value);`
`51`	`51`	`return true;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`DecorationType value() const override`
`55`	`55`	`{`
`56`		`- if (Base::value() > SVGIDLEnumLimits<EnumType>::highestExposedEnumValue())`
	`56`	`+ if (Base::value() > SVGPropertyTraits<EnumType>::highestEnumValue())`
`57`	`57`	`return m_outOfRangeEnumValue;`
`58`	`58`	`return Base::value();`
`59`	`59`	`}`