Use CGStyle-based filters for saturate() and hue-rotate() - dropped frames on fakecake.org

smfr · smfr · commit e664737f1d2f · 2025-05-22T07:33:14.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=293212 rdar://148338705 Reviewed by Sam Weinig. The code in `FEColorMatrix::supportedFilterRenderingModes()` caused fallback to `FilterRenderingMode::Software` for `hue-rotate()` and `saturate()` filters, because we didn't have code that converted these to a color matrix. However, that code exists in ColorMatrix, so we can use it. I attempted to have GraphicsColorMatrix own a ColorMatrix<5, 4>, but that isn't easily IPC-encodable. Instead, add a `ColorMatrix` constructors that takes a span, and make the variadic constructor limited to numeric types. * LayoutTests/css3/filters/effect-blur-hw.html: * LayoutTests/css3/filters/effect-brightness-hw.html: * LayoutTests/css3/filters/effect-combined.html: * LayoutTests/css3/filters/effect-grayscale-hw.html: * LayoutTests/css3/filters/effect-hue-rotate-hw.html: * LayoutTests/css3/filters/effect-hue-rotate.html: * LayoutTests/css3/filters/effect-invert-hw.html: * LayoutTests/css3/filters/effect-opacity-hw.html: * LayoutTests/css3/filters/effect-saturate.html: * LayoutTests/css3/filters/effect-sepia-hw.html: * LayoutTests/css3/filters/invalid-reference-filter-in-chain.html: * LayoutTests/css3/filters/resources/filter-helpers.css: Use image-rendering: crisp-edges to reduce noise on iOS where images get scaled. * LayoutTests/fast/filter-image/filter-image.html: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/platform/graphics/ColorMatrix.h: (WebCore::ColorMatrix::ColorMatrix): (WebCore::ColorMatrix::data const): (WebCore::to5x4Matrix): * Source/WebCore/platform/graphics/GraphicsStyle.h: * Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp: (WebCore::FEColorMatrix::supportedFilterRenderingModes const): (WebCore::FEColorMatrix::createGraphicsStyle const): * Source/WebCore/platform/graphics/filters/FilterRenderingMode.cpp: Copied from Source/WebCore/platform/graphics/filters/FilterRenderingMode.h. (WebCore::operator<<): Make FilterRenderingMode streamable. * Source/WebCore/platform/graphics/filters/FilterRenderingMode.h: * Source/WebCore/rendering/CSSFilter.cpp: (WebCore::CSSFilter::create): Log the rendering mode. Canonical link: https://commits.webkit.org/295269@main
diff --git a/LayoutTests/css3/filters/effect-blur-hw.html b/LayoutTests/css3/filters/effect-blur-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-54; totalPixels=0-61800">
+    <meta name="fuzzy" content="maxDifference=0-99; totalPixels=0-61800">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-brightness-hw.html b/LayoutTests/css3/filters/effect-brightness-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-41000">
+    <meta name="fuzzy" content="maxDifference=0-186; totalPixels=0-41100">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-combined.html b/LayoutTests/css3/filters/effect-combined.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-20; totalPixels=0-600" />
+    <meta name="fuzzy" content="maxDifference=0-20; totalPixels=0-26400" />
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <script src="resources/filter-helpers.js"></script>
 </head>
diff --git a/LayoutTests/css3/filters/effect-grayscale-hw.html b/LayoutTests/css3/filters/effect-grayscale-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-54; totalPixels=0-33000">
+    <meta name="fuzzy" content="maxDifference=0-99; totalPixels=0-33050">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-hue-rotate-hw.html b/LayoutTests/css3/filters/effect-hue-rotate-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-68; totalPixels=0-22400">
+    <meta name="fuzzy" content="maxDifference=0-123; totalPixels=0-22400">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-hue-rotate.html b/LayoutTests/css3/filters/effect-hue-rotate.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-48; totalPixels=0-2500">
+    <meta name="fuzzy" content="maxDifference=0-48; totalPixels=0-55700">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <script src="resources/filter-helpers.js"></script>
 </head>
diff --git a/LayoutTests/css3/filters/effect-invert-hw.html b/LayoutTests/css3/filters/effect-invert-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-54; totalPixels=0-40300" />
+    <meta name="fuzzy" content="maxDifference=0-99; totalPixels=0-40410" />
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-opacity-hw.html b/LayoutTests/css3/filters/effect-opacity-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-54; totalPixels=0-29200">
+    <meta name="fuzzy" content="maxDifference=0-99; totalPixels=0-29200">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/effect-saturate.html b/LayoutTests/css3/filters/effect-saturate.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-48; totalPixels=0-2500">
+    <meta name="fuzzy" content="maxDifference=0-48; totalPixels=0-33200">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <script src="resources/filter-helpers.js"></script>
 </head>
diff --git a/LayoutTests/css3/filters/effect-sepia-hw.html b/LayoutTests/css3/filters/effect-sepia-hw.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-54; totalPixels=0-36800">
+    <meta name="fuzzy" content="maxDifference=0-99; totalPixels=0-36800">
     <link rel="stylesheet" href="resources/filter-helpers.css">
     <style>
         img {
diff --git a/LayoutTests/css3/filters/invalid-reference-filter-in-chain.html b/LayoutTests/css3/filters/invalid-reference-filter-in-chain.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<meta name="fuzzy" content="maxDifference=1; totalPixels=25600" />
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-40000" />
 <html>
 <head>
 <style>
diff --git a/LayoutTests/css3/filters/resources/filter-helpers.css b/LayoutTests/css3/filters/resources/filter-helpers.css
@@ -1,5 +1,6 @@
 img {
     margin: 10px;
+    image-rendering: crisp-edges;
 }
 
 svg {
diff --git a/LayoutTests/fast/filter-image/filter-image.html b/LayoutTests/fast/filter-image/filter-image.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-5000" />
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-7500" />
 <style>
 div {
     width: 50px;
diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
@@ -2611,6 +2611,7 @@ platform/graphics/filters/FilterFunction.cpp
 platform/graphics/filters/FilterImage.cpp
 platform/graphics/filters/FilterOperation.cpp
 platform/graphics/filters/FilterOperations.cpp
+platform/graphics/filters/FilterRenderingMode.cpp
 platform/graphics/filters/FilterResults.cpp
 platform/graphics/filters/PointLightSource.cpp
 platform/graphics/filters/SourceAlpha.cpp
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -7464,6 +7464,7 @@
 		0E7058ED1BC5BC190045A507 /* SearchPopupMenuCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchPopupMenuCocoa.mm; sourceTree = "<group>"; };
 		0E7058F31BC5CCD70045A507 /* SearchPopupMenuCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SearchPopupMenuCocoa.h; sourceTree = "<group>"; };
 		0E9C1155291BF3CC00A2C2F2 /* ScreenDataOverrides.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScreenDataOverrides.h; sourceTree = "<group>"; };
+		0F0213B92DDA4E9000360760 /* FilterRenderingMode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FilterRenderingMode.cpp; sourceTree = "<group>"; };
 		0F02245026F15D5F000265C3 /* ScrollbarsController.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarsController.cpp; sourceTree = "<group>"; };
 		0F02245226F15D5F000265C3 /* ScrollbarsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScrollbarsController.h; sourceTree = "<group>"; };
 		0F02245326F15D75000265C3 /* ScrollbarsControllerMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollbarsControllerMac.mm; sourceTree = "<group>"; };
@@ -32140,6 +32141,7 @@
 				49ECEB641499790D00CDD3A4 /* FilterOperation.h */,
 				49ECEB651499790D00CDD3A4 /* FilterOperations.cpp */,
 				49ECEB661499790D00CDD3A4 /* FilterOperations.h */,
+				0F0213B92DDA4E9000360760 /* FilterRenderingMode.cpp */,
 				727003E5292F2DBB0094C64B /* FilterRenderingMode.h */,
 				724DCF1D28485C330026ACF4 /* FilterResults.cpp */,
 				7211B5D6276536820076FEF8 /* FilterResults.h */,
diff --git a/Source/WebCore/platform/graphics/ColorMatrix.h b/Source/WebCore/platform/graphics/ColorMatrix.h
@@ -35,13 +35,21 @@ template<typename, size_t> struct ColorComponents;
 template<size_t ColumnCount, size_t RowCount>
 class ColorMatrix {
 public:
-    template<typename ...Ts>
+    explicit constexpr ColorMatrix(std::span<const float, RowCount * ColumnCount> s)
+    {
+        std::ranges::copy(s, m_matrix.begin());
+    }
+
+    template<std::convertible_to<float> ...Ts>
     explicit constexpr ColorMatrix(Ts ...input)
         : m_matrix {{ static_cast<float>(input) ... }}
     {
         static_assert(sizeof...(Ts) == RowCount * ColumnCount);
     }
 
+    template<size_t ToColumnCount, size_t ToRowCount>
+    constexpr operator ColorMatrix<ToColumnCount, ToRowCount>() const;
+
     template<size_t NumberOfComponents>
     constexpr ColorComponents<float, NumberOfComponents> transformedColorComponents(const ColorComponents<float, NumberOfComponents>&) const;
 
@@ -50,12 +58,24 @@ class ColorMatrix {
         return m_matrix[(row * ColumnCount) + column];
     }
 
+    const std::array<float, RowCount * ColumnCount>& data() const { return m_matrix; }
+
     friend bool operator==(const ColorMatrix&, const ColorMatrix&) = default;
 
 private:
     std::array<float, RowCount * ColumnCount> m_matrix;
 };
 
+template <> template <> constexpr ColorMatrix<3, 3>::operator ColorMatrix<5, 4>() const
+{
+    return ColorMatrix<5, 4> {
+        at(0, 0), at(0, 1), at(0, 2), 0, 0,
+        at(1, 0), at(1, 1), at(1, 2), 0, 0,
+        at(2, 0), at(2, 1), at(2, 2), 0, 0,
+        0, 0, 0, 1, 0
+    };
+}
+
 constexpr ColorMatrix<3, 3> brightnessColorMatrix(float amount)
 {
     // Brightness is specified as a component transfer function: https://www.w3.org/TR/filter-effects-1/#brightnessEquivalent
diff --git a/Source/WebCore/platform/graphics/GraphicsStyle.h b/Source/WebCore/platform/graphics/GraphicsStyle.h
@@ -66,7 +66,7 @@ struct GraphicsGaussianBlur {
 };
 
 struct GraphicsColorMatrix {
-    std::array<float, 20> values;
+    std::array<float, 20> values; // Really a ColorMatrix<5, 4>.
 
     friend bool operator==(const GraphicsColorMatrix&, const GraphicsColorMatrix&) = default;
 };
diff --git a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
@@ -132,7 +132,9 @@ OptionSet<FilterRenderingMode> FEColorMatrix::supportedFilterRenderingModes() co
     modes.add(FilterRenderingMode::Accelerated);
 #endif
 #if HAVE(CGSTYLE_COLORMATRIX_BLUR)
-    if (m_type == ColorMatrixType::FECOLORMATRIX_TYPE_MATRIX)
+    if (m_type == ColorMatrixType::FECOLORMATRIX_TYPE_MATRIX
+        || m_type == ColorMatrixType::FECOLORMATRIX_TYPE_SATURATE
+        || m_type == ColorMatrixType::FECOLORMATRIX_TYPE_HUEROTATE)
         modes.add(FilterRenderingMode::GraphicsContext);
 #endif
     return modes;
@@ -160,9 +162,25 @@ std::unique_ptr<FilterEffectApplier> FEColorMatrix::createSoftwareApplier() cons
 
 std::optional<GraphicsStyle> FEColorMatrix::createGraphicsStyle(GraphicsContext&, const Filter&) const
 {
-    std::array<float, 20> values;
-    std::copy_n(m_values.begin(), std::min<size_t>(m_values.size(), 20), values.begin());
-    return GraphicsColorMatrix { values };
+    switch (m_type) {
+    case ColorMatrixType::FECOLORMATRIX_TYPE_MATRIX: {
+        RELEASE_ASSERT(m_values.size() == 20);
+        GraphicsColorMatrix result;
+        std::copy_n(m_values.begin(), std::min<size_t>(m_values.size(), 20), result.values.begin());
+        return result;
+    }
+    case ColorMatrixType::FECOLORMATRIX_TYPE_SATURATE:
+        return GraphicsColorMatrix { ColorMatrix<5, 4>(saturationColorMatrix(m_values[0])).data() };
+
+    case ColorMatrixType::FECOLORMATRIX_TYPE_HUEROTATE:
+        return GraphicsColorMatrix { ColorMatrix<5, 4>(hueRotateColorMatrix(m_values[0])).data() };
+
+    default:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+
+    return { };
 }
 
 static TextStream& operator<<(TextStream& ts, const ColorMatrixType& type)
diff --git a/Source/WebCore/platform/graphics/filters/FilterRenderingMode.cpp b/Source/WebCore/platform/graphics/filters/FilterRenderingMode.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2025 Apple Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FilterRenderingMode.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, FilterRenderingMode mode)
+{
+    switch (mode) {
+    case FilterRenderingMode::Software: ts << "Software"; break;
+    case FilterRenderingMode::Accelerated: ts << "Accelerated"; break;
+    case FilterRenderingMode::GraphicsContext: ts << "GraphicsContext"; break;
+    }
+
+    return ts;
+}
+
+
+} // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/filters/FilterRenderingMode.h b/Source/WebCore/platform/graphics/filters/FilterRenderingMode.h
@@ -41,4 +41,6 @@ constexpr OptionSet<FilterRenderingMode> allFilterRenderingModes = {
     FilterRenderingMode::GraphicsContext
 };
 
+WTF::TextStream& operator<<(WTF::TextStream&, FilterRenderingMode);
+
 } // namespace WebCore
diff --git a/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -35,6 +35,7 @@
 #include "GLContext.h"
 #include "ImageBuffer.h"
 #include "IntRect.h"
+#include "NativeImage.h"
 #include "NotImplemented.h"
 #include "PlatformDisplay.h"
 #include "ProcessCapabilities.h"
diff --git a/Source/WebCore/platform/gtk/DragImageGtk.cpp b/Source/WebCore/platform/gtk/DragImageGtk.cpp
@@ -21,6 +21,7 @@
 
 #include "Element.h"
 #include "Image.h"
+#include "NativeImage.h"
 #include "TextFlags.h"
 #include "TextIndicator.h"
 #include <cairo.h>
diff --git a/Source/WebCore/rendering/CSSFilter.cpp b/Source/WebCore/rendering/CSSFilter.cpp
@@ -59,9 +59,10 @@ RefPtr<CSSFilter> CSSFilter::create(RenderElement& renderer, const FilterOperati
         return nullptr;
     }
 
-    LOG_WITH_STREAM(Filters, stream << "CSSFilter::create built filter " << filter.get() << " for " << operations);
-
     filter->setFilterRenderingModes(preferredFilterRenderingModes);
+
+    LOG_WITH_STREAM(Filters, stream << "CSSFilter::create built filter " << filter.get() << " for " << operations << " supported rendering mode(s) " << filter->filterRenderingModes());
+
     return filter;
 }
 
