Merge pull request #1287 from WebPlatformForEmbedded/pgorszkowski/2.38/enable_support_for_linearRGB_color_space

magomez · web-flow · commit 6dc3ccc7add2 · 2024-02-22T10:43:18.000+01:00
Regression(251234@main): [Cairo][GTK][WPE] Darker output of SVG with …
diff --git a/LayoutTests/fast/gradients/conic-gradient-extended-stops.html b/LayoutTests/fast/gradients/conic-gradient-extended-stops.html
@@ -36,6 +36,7 @@
 
 <body>
 <svg viewBox="0 0 700 100">
+<meta name="fuzzy" content="maxDifference=0-16; totalPixels=0-30000" />
 <defs>
     <filter id="posterize" filterUnits="objectBoundingBox" primitiveUnits="objectBoundingBox">
         <feComponentTransfer color-interpolation-filters="sRGB">
diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
@@ -2651,15 +2651,11 @@ fast/text/line-break-with-locale.html [ ImageOnlyFailure ]
 webkit.org/b/225423 fast/canvas/canvas-composite-text-alpha.html [ Failure ]
 
 # Non-sRGB color spaces are not currently supported by the glib ports.
-css3/color-filters/svg/color-filter-inline-svg.html [ ImageOnlyFailure ]
-css3/filters/reference-filter-color-space.html [ ImageOnlyFailure ]
 fast/canvas/canvas-color-space-display-p3.html [ Skip ]
 fast/canvas/canvas-color-space-display-p3-ImageData.html [ Skip ]
 imported/w3c/web-platform-tests/html/canvas/element/wide-gamut-canvas/ [ Skip ]
 imported/w3c/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/ [ Skip ]
 imported/w3c/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/ [ Skip ]
-svg/filters/feCompositeOpaque.html [ ImageOnlyFailure ]
-svg/filters/feDiffuseLighting-bottomRightPixel.html [ ImageOnlyFailure ]
 
 storage/indexeddb/structured-clone-image-data-display-p3.html [ Skip ]
 
diff --git a/LayoutTests/svg/filters/feConvolveMatrix-clipped.svg b/LayoutTests/svg/filters/feConvolveMatrix-clipped.svg
@@ -1,4 +1,5 @@
 <svg width="480px" height="600px" xmlns="http://www.w3.org/2000/svg">
+<meta name="fuzzy" content="maxDifference=3; totalPixels=90000" />
 <defs>
     <filter id="filter" filterUnits="objectBoundingBox" x="0" y="0" width="100%" height="100%">
     	<feFlood x="0" y="0" width="300" height="300" flood-color="rgb(93, 10, 53)" result="flood1" color-interpolation-filters="sRGB"/>
diff --git a/LayoutTests/svg/filters/feGaussianBlur-clipped.svg b/LayoutTests/svg/filters/feGaussianBlur-clipped.svg
@@ -1,4 +1,5 @@
  <svg width="400px" height="400px" xmlns="http://www.w3.org/2000/svg">
+ <meta name="fuzzy" content="maxDifference=6; totalPixels=144400" />
   <defs>
     <filter id="filter" filterUnits="objectBoundingBox" x="0" y="0" width="100%" height="100%">
     	<feFlood x="0" y="0" width="500" height="500" flood-color="rgb(93, 7, 54)" result="flood1" color-interpolation-filters="sRGB"/>
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
@@ -245,7 +245,7 @@
 #endif
 
 #if !defined(ENABLE_DESTINATION_COLOR_SPACE_LINEAR_SRGB)
-#define ENABLE_DESTINATION_COLOR_SPACE_LINEAR_SRGB 0
+#define ENABLE_DESTINATION_COLOR_SPACE_LINEAR_SRGB 1
 #endif
 
 #if !defined(ENABLE_DOWNLOAD_ATTRIBUTE)
diff --git a/Source/WebCore/platform/graphics/filters/FEDropShadow.h b/Source/WebCore/platform/graphics/filters/FEDropShadow.h
@@ -51,6 +51,10 @@ class FEDropShadow : public FilterEffect {
 
     template<class Encoder> void encode(Encoder&) const;
     template<class Decoder> static std::optional<Ref<FEDropShadow>> decode(Decoder&);
+#if USE(CAIRO)
+    void setOperatingColorSpace(const DestinationColorSpace&) override { }
+#endif
+
 
 private:
     FEDropShadow(float stdX, float stdY, float dx, float dy, const Color& shadowColor, float shadowOpacity);
diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp b/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp
@@ -31,14 +31,15 @@
 
 namespace WebCore {
 
-Ref<SourceGraphic> SourceGraphic::create()
+Ref<SourceGraphic> SourceGraphic::create(const DestinationColorSpace& colorSpace)
 {
-    return adoptRef(*new SourceGraphic());
+    return adoptRef(*new SourceGraphic(colorSpace));
 }
 
-SourceGraphic::SourceGraphic()
+SourceGraphic::SourceGraphic(const DestinationColorSpace& colorSpace)
     : FilterEffect(FilterEffect::Type::SourceGraphic)
 {
+    setOperatingColorSpace(colorSpace);
 }
 
 bool SourceGraphic::supportsAcceleratedRendering() const
diff --git a/Source/WebCore/platform/graphics/filters/SourceGraphic.h b/Source/WebCore/platform/graphics/filters/SourceGraphic.h
@@ -27,12 +27,12 @@ namespace WebCore {
 
 class SourceGraphic : public FilterEffect {
 public:        
-    WEBCORE_EXPORT static Ref<SourceGraphic> create();
+    WEBCORE_EXPORT static Ref<SourceGraphic> create(const DestinationColorSpace& = DestinationColorSpace::SRGB());
 
     static AtomString effectName() { return FilterEffect::sourceGraphicName(); }
 
 private:
-    SourceGraphic();
+    SourceGraphic(const DestinationColorSpace&);
 
     unsigned numberOfEffectInputs() const override { return 0; }
 
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp
@@ -140,10 +140,10 @@ bool RenderSVGResourceFilter::applyResource(RenderElement& renderer, const Rende
         return false;
     }
 
-#if ENABLE(DESTINATION_COLOR_SPACE_LINEAR_SRGB)
-    auto colorSpace = DestinationColorSpace::LinearSRGB();
-#else
+#if USE(CAIRO)
     auto colorSpace = DestinationColorSpace::SRGB();
+#else
+    auto colorSpace = DestinationColorSpace::LinearSRGB();
 #endif
 
     filterData->sourceImage = context->createScaledImageBuffer(filterData->sourceImageRect, filterScale, colorSpace, filterData->filter->renderingMode());
@@ -203,6 +203,13 @@ void RenderSVGResourceFilter::postApplyResource(RenderElement& renderer, Graphic
 
     if (filterData.filter) {
         filterData.state = FilterData::Built;
+#if USE(CAIRO)
+        // Cairo operates in SRGB which is why the SourceImage initially is in SRGB color space,
+        // but before applying all filters it has to be transformed to LinearRGB to comply with
+        // specification (https://www.w3.org/TR/filter-effects-1/#attr-valuedef-in-sourcegraphic).
+        if (filterData.sourceImage.get())
+            filterData.sourceImage.get()->transformToColorSpace(DestinationColorSpace::LinearSRGB());
+#endif
         context->drawFilteredImageBuffer(filterData.sourceImage.get(), filterData.sourceImageRect, *filterData.filter, filterData.results);
     }
 
diff --git a/Source/WebCore/svg/graphics/filters/SVGFilter.cpp b/Source/WebCore/svg/graphics/filters/SVGFilter.cpp
@@ -78,7 +78,8 @@ static std::optional<std::tuple<SVGFilterEffectsGraph, FilterEffectGeometryMap>>
     if (filterElement.countChildNodes() > maxCountChildNodes)
         return std::nullopt;
 
-    SVGFilterEffectsGraph graph(SourceGraphic::create(), SourceAlpha::create());
+    const auto colorSpace = filterElement.colorInterpolation() == ColorInterpolation::LinearRGB ? DestinationColorSpace::LinearSRGB() : DestinationColorSpace::SRGB();
+    SVGFilterEffectsGraph graph(SourceGraphic::create(colorSpace), SourceAlpha::create(colorSpace));
     FilterEffectGeometryMap effectGeometryMap;
 
     for (auto& effectElement : childrenOfType<SVGFilterPrimitiveStandardAttributes>(filterElement)) {

Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,15 @@`
`31`	`31`
`32`	`32`	`namespace WebCore {`
`33`	`33`
`34`		`-Ref<SourceGraphic> SourceGraphic::create()`
	`34`	`+Ref<SourceGraphic> SourceGraphic::create(const DestinationColorSpace& colorSpace)`
`35`	`35`	`{`
`36`		`- return adoptRef(*new SourceGraphic());`
	`36`	`+ return adoptRef(*new SourceGraphic(colorSpace));`
`37`	`37`	`}`
`38`	`38`
`39`		`-SourceGraphic::SourceGraphic()`
	`39`	`+SourceGraphic::SourceGraphic(const DestinationColorSpace& colorSpace)`
`40`	`40`	`: FilterEffect(FilterEffect::Type::SourceGraphic)`
`41`	`41`	`{`
	`42`	`+ setOperatingColorSpace(colorSpace);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`bool SourceGraphic::supportsAcceleratedRendering() const`