Attachment 429137 Details for Bug 225907 – WIP patch

[patch] WIP patch

b.diff (text/plain), 3.66 KB, created by Fujii Hironori on 2021-05-19 22:32:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2021-05-19 22:32:53 PDT

Size: 3.66 KB

patch

obsolete

>diff --git a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
>index cccc602cda5b..7588dcdadcc9 100644
>--- a/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
>+++ b/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp
>@@ -285,7 +285,7 @@ void FEColorMatrix::platformApplySoftware()
>     if (inBuffer)
>         resultImage->context().drawImageBuffer(*inBuffer, drawingRegionOfInputImage(in->absolutePaintRect()));
> 
>-    PixelBufferFormat format { AlphaPremultiplication::Unpremultiplied, PixelFormat::RGBA8, DestinationColorSpace::SRGB };
>+    PixelBufferFormat format { AlphaPremultiplication::Unpremultiplied, PixelFormat::RGBA8, resultColorSpace() };
>     IntRect imageRect(IntPoint(), resultImage->logicalSize());
>     auto pixelBuffer = resultImage->getPixelBuffer(format, imageRect);
>     if (!pixelBuffer)
>diff --git a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
>index a855a202173e..e15e34ba3d6f 100644
>--- a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
>+++ b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp
>@@ -78,13 +78,6 @@ void FEDisplacementMap::setResultColorSpace(DestinationColorSpace)
>     FilterEffect::setResultColorSpace(inputEffect(0)->resultColorSpace());
> }
> 
>-void FEDisplacementMap::transformResultColorSpace(FilterEffect* in, const int index)
>-{
>-    // Do not transform the first primitive input, as per the spec.
>-    if (index)
>-        in->transformResultColorSpace(operatingColorSpace());
>-}
>-
> static inline unsigned byteOffsetOfPixel(unsigned x, unsigned y, unsigned rowBytes)
> {
>     const unsigned bytesPerPixel = 4;
>diff --git a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h
>index cebbc0b138ca..22d8053e75e9 100644
>--- a/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h
>+++ b/Source/WebCore/platform/graphics/filters/FEDisplacementMap.h
>@@ -49,7 +49,6 @@ public:
>     bool setScale(float);
> 
>     void setResultColorSpace(DestinationColorSpace) override;
>-    void transformResultColorSpace(FilterEffect*, const int) override;
> 
> private:
>     FEDisplacementMap(Filter&, ChannelSelectorType xChannelSelector, ChannelSelectorType yChannelSelector, float);
>diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
>index ac26d2017c74..7b40b3dccdb1 100644
>--- a/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
>+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
>@@ -173,9 +173,6 @@ void FilterEffect::apply()
>         in->apply();
>         if (!in->hasResult())
>             return;
>-
>-        // Convert input results to the current effect's color space.
>-        transformResultColorSpace(in, i);
>     }
> 
>     determineAbsolutePaintRect();
>diff --git a/Source/WebCore/platform/graphics/filters/FilterEffect.h b/Source/WebCore/platform/graphics/filters/FilterEffect.h
>index 9cdfe757b397..6703b4ef2f28 100644
>--- a/Source/WebCore/platform/graphics/filters/FilterEffect.h
>+++ b/Source/WebCore/platform/graphics/filters/FilterEffect.h
>@@ -170,7 +170,6 @@ public:
>     DestinationColorSpace resultColorSpace() const { return m_resultColorSpace; }
>     virtual void setResultColorSpace(DestinationColorSpace colorSpace) { m_resultColorSpace = colorSpace; }
> 
>-    virtual void transformResultColorSpace(FilterEffect* in, const int) { in->transformResultColorSpace(m_operatingColorSpace); }
>     void transformResultColorSpace(DestinationColorSpace);
>     
>     static Vector<float> normalizedFloats(const Vector<float>& values)

Actions: View | Formatted Diff | Diff

Attachments on bug 225907: 428914 | 428983 | 429094 | 429132 | 429137 | 429266