Changeset 290568 in webkit

Timestamp:

Feb 27, 2022 12:31:57 PM (5 months ago)

Author:

graouts@webkit.org

Message:

[svg] fill-opacity should be clamped to the [0,1] range
​https://bugs.webkit.org/show_bug.cgi?id=237252

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

• web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
• web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:

Source/WebCore:

• rendering/style/SVGRenderStyle.h:

(WebCore::SVGRenderStyle::setFillOpacity):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/SVGRenderStyle.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-27  Antoine Quint  <graouts@webkit.org>
+
+        [svg] fill-opacity should be clamped to the [0,1] range
+        https://bugs.webkit.org/show_bug.cgi?id=237252
+
+        Reviewed by Dean Jackson.
+
+        * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
+        * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
+
 2022-02-27  Tim Nguyen  <ntim@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt

@@ -172 +172 @@
 PASS fill-opacity (type: opacity) has testAccumulation function
 PASS fill-opacity: [0, 1] number
-FAIL fill-opacity: [0, 1] number (clamped) assert_equals: The value should be 1 at 0ms expected "1" but got "1.1"
+PASS fill-opacity: [0, 1] number (clamped)
 PASS filter (type: filterList) has testAccumulation function
 FAIL filter: same ordered filter functions assert_equals: The value should be blur(30px) brightness(0) at 0ms expected "blur(30px) brightness(0)" but got "blur(30px) brightness(0.4)"

trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt

@@ -172 +172 @@
 PASS fill-opacity (type: opacity) has testAddition function
 PASS fill-opacity: [0, 1] number
-FAIL fill-opacity: [0, 1] number (clamped) assert_equals: The value should be 1 at 0ms expected "1" but got "1.1"
+PASS fill-opacity: [0, 1] number (clamped)
 PASS filter (type: filterList) has testAddition function
 FAIL filter: blur on blur assert_equals: The value should be blur(10px) blur(20px) at 0ms expected "blur(10px) blur(20px)" but got "blur(30px)"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-27  Antoine Quint  <graouts@webkit.org>
+
+        [svg] fill-opacity should be clamped to the [0,1] range
+        https://bugs.webkit.org/show_bug.cgi?id=237252
+
+        Reviewed by Dean Jackson.
+
+        * rendering/style/SVGRenderStyle.h:
+        (WebCore::SVGRenderStyle::setFillOpacity):
+
 2022-02-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/style/SVGRenderStyle.h

@@ -283 +283 @@
 inline void SVGRenderStyle::setFillOpacity(float opacity)
 {
-    if (!(m_fillData->opacity == opacity))
-        m_fillData.access().opacity = opacity;
+    auto clampedOpacity = clampTo<float>(opacity, 0.f, 1.f);
+    if (!(m_fillData->opacity == clampedOpacity))
+        m_fillData.access().opacity = clampedOpacity;
 }