[GTK] Remove PlatformDisplay::colorProfile()

https://bugs.webkit.org/show_bug.cgi?id=276991

Reviewed by Michael Catanzaro.

This is used by some image decoders to convert from embedded ICC profile
to destination target. However, the target is not really the display,
but the SkImage that is always created with SRGB color space. Also,
PlatformDisplay::colorProfile() is always creating an SRGB profile
except for X11 platform that the profile id the one from the display.

* Source/WebCore/platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::colorProfile const): Deleted.
* Source/WebCore/platform/graphics/PlatformDisplay.h:
* Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp:
(WebCore::PlatformDisplayX11::colorProfile const): Deleted.
* Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h:
* Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
(WebCore::JPEGImageDecoder::setICCProfile):
* Source/WebCore/platform/image-decoders/jpegxl/JPEGXLImageDecoder.cpp:
(WebCore::JPEGXLImageDecoder::prepareColorTransform):
* Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:
(WebCore::PNGImageDecoder::headerAvailable):

Canonical link: https://commits.webkit.org/281293@main

Author: carlosgcampos

Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -592,15 +592,6 @@ const Vector<PlatformDisplay::DMABufFormat>& PlatformDisplay::dmabufFormats()
 }
 #endif // USE(GBM)
 
-#if USE(LCMS)
-cmsHPROFILE PlatformDisplay::colorProfile() const
-{
-    if (!m_iccProfile)
-        m_iccProfile = LCMSProfilePtr(cmsCreate_sRGBProfile());
-    return m_iccProfile.get();
-}
-#endif
-
 #if USE(ATSPI)
 const String& PlatformDisplay::accessibilityBusAddress() const
 {

Source/WebCore/platform/graphics/PlatformDisplay.h

@@ -55,10 +55,6 @@ typedef struct _GstGLContext GstGLContext;
 typedef struct _GstGLDisplay GstGLDisplay;
 #endif // ENABLE(VIDEO) && USE(GSTREAMER_GL)
 
-#if USE(LCMS)
-#include "LCMSUniquePtr.h"
-#endif
-
 #if USE(SKIA)
 #include <skia/gpu/GrDirectContext.h>
 #include <wtf/ThreadSafeWeakHashSet.h>
@@ -148,10 +144,6 @@ class PlatformDisplay {
     GrDirectContext* skiaGrContext();
 #endif
 
-#if USE(LCMS)
-    virtual cmsHPROFILE colorProfile() const;
-#endif
-
 #if USE(ATSPI)
     const String& accessibilityBusAddress() const;
 #endif
@@ -190,10 +182,6 @@ class PlatformDisplay {
     void* m_angleNativeDisplay { nullptr };
 #endif
 
-#if USE(LCMS)
-    mutable LCMSProfilePtr m_iccProfile;
-#endif
-
 #if USE(ATSPI)
     virtual String platformAccessibilityBusAddress() const { return { }; }
 

Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp

@@ -144,46 +144,6 @@ void PlatformDisplayX11::initializeEGLDisplay()
 #endif
 }
 
-#if USE(LCMS)
-cmsHPROFILE PlatformDisplayX11::colorProfile() const
-{
-    if (m_iccProfile)
-        return m_iccProfile.get();
-
-    Atom iccAtom = XInternAtom(m_display, "_ICC_PROFILE", False);
-    Atom type;
-    int format;
-    unsigned long itemCount, bytesAfter;
-    unsigned char* data = nullptr;
-    auto result = XGetWindowProperty(m_display, RootWindowOfScreen(DefaultScreenOfDisplay(m_display)), iccAtom, 0L, ~0L, False, XA_CARDINAL, &type, &format, &itemCount, &bytesAfter, &data);
-    if (result == Success && type == XA_CARDINAL && itemCount > 0) {
-        unsigned long dataSize;
-        switch (format) {
-        case 8:
-            dataSize = itemCount;
-            break;
-        case 16:
-            dataSize = sizeof(short) * itemCount;
-            break;
-        case 32:
-            dataSize = sizeof(long) * itemCount;
-            break;
-        default:
-            dataSize = 0;
-            break;
-        }
-
-        if (dataSize)
-            m_iccProfile = LCMSProfilePtr(cmsOpenProfileFromMem(data, dataSize));
-    }
-
-    if (data)
-        XFree(data);
-
-    return m_iccProfile ? m_iccProfile.get() : PlatformDisplay::colorProfile();
-}
-#endif
-
 #if USE(ATSPI)
 String PlatformDisplayX11::platformAccessibilityBusAddress() const
 {

Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h

@@ -60,10 +60,6 @@ class PlatformDisplayX11 final : public PlatformDisplay {
 #endif
     void initializeEGLDisplay() override;
 
-#if USE(LCMS)
-    cmsHPROFILE colorProfile() const override;
-#endif
-
 #if USE(ATSPI)
     String platformAccessibilityBusAddress() const override;
 #endif

Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

@@ -40,7 +40,9 @@
 #include "config.h"
 #include "JPEGImageDecoder.h"
 
-#include "PlatformDisplay.h"
+#if USE(LCMS)
+#include "LCMSUniquePtr.h"
+#endif
 
 extern "C" {
 #include <setjmp.h>
@@ -723,14 +725,11 @@ void JPEGImageDecoder::setICCProfile(RefPtr<SharedBuffer>&& buffer)
 
     auto span = buffer->span();
     auto iccProfile = LCMSProfilePtr(cmsOpenProfileFromMem(span.data(), span.size()));
-    if (!iccProfile)
-        return;
-
-    auto* displayProfile = PlatformDisplay::sharedDisplay().colorProfile();
-    if (cmsGetColorSpace(iccProfile.get()) != cmsSigRgbData || cmsGetColorSpace(displayProfile) != cmsSigRgbData)
+    if (!iccProfile || cmsGetColorSpace(iccProfile.get()) != cmsSigRgbData)
         return;
 
-    m_iccTransform = LCMSTransformPtr(cmsCreateTransform(iccProfile.get(), TYPE_BGRA_8, displayProfile, TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
+    auto srgbProfile = LCMSProfilePtr(cmsCreate_sRGBProfile());
+    m_iccTransform = LCMSTransformPtr(cmsCreateTransform(iccProfile.get(), TYPE_BGRA_8, srgbProfile.get(), TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
 }
 #endif
 

Source/WebCore/platform/image-decoders/jpegxl/JPEGXLImageDecoder.cpp

@@ -32,7 +32,7 @@
 #include "PixelBufferConversion.h"
 
 #if USE(LCMS)
-#include "PlatformDisplay.h"
+#include "LCMSUniquePtr.h"
 #endif
 
 #if PLATFORM(COCOA)
@@ -410,18 +410,14 @@ void JPEGXLImageDecoder::prepareColorTransform()
     if (m_iccTransform)
         return;
 
-    cmsHPROFILE displayProfile = PlatformDisplay::sharedDisplay().colorProfile();
-    if (!displayProfile)
-        return;
-
     auto profile = tryDecodeICCColorProfile();
-    if (!profile)
+    if (!profile || cmsGetColorSpace(profile.get()) != cmsSigRgbData)
         return; // TODO(bugs.webkit.org/show_bug.cgi?id=234222): We should try to use encoded color profile if ICC profile is not available.
 
     // TODO(bugs.webkit.org/show_bug.cgi?id=234221): We should handle CMYK color but it may require two extra channels (Alpha and K)
     // and libjxl has yet to support it.
-    if (cmsGetColorSpace(profile.get()) == cmsSigRgbData && cmsGetColorSpace(displayProfile) == cmsSigRgbData)
-        m_iccTransform = LCMSTransformPtr(cmsCreateTransform(profile.get(), TYPE_BGRA_8, displayProfile, TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
+    auto srgbProfile = LCMSProfilePtr(cmsCreate_sRGBProfile());
+    m_iccTransform = LCMSTransformPtr(cmsCreateTransform(profile.get(), TYPE_BGRA_8, srgbProfile.get(), TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
 }
 
 LCMSProfilePtr JPEGXLImageDecoder::tryDecodeICCColorProfile()

Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp

@@ -42,11 +42,14 @@
 #include "PNGImageDecoder.h"
 
 #include "Color.h"
-#include "PlatformDisplay.h"
 #include <png.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/UniqueArray.h>
 
+#if USE(LCMS)
+#include "LCMSUniquePtr.h"
+#endif
+
 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4))
 #define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
 #else
@@ -381,10 +384,9 @@ void PNGImageDecoder::headerAvailable()
         int compressionType;
         if (png_get_iCCP(png, info, &iccProfileTitle, &compressionType, &iccProfileData, &iccProfileDataSize)) {
             auto iccProfile = LCMSProfilePtr(cmsOpenProfileFromMem(iccProfileData, iccProfileDataSize));
-            if (iccProfile) {
-                auto* displayProfile = PlatformDisplay::sharedDisplay().colorProfile();
-                if (cmsGetColorSpace(iccProfile.get()) == cmsSigRgbData && cmsGetColorSpace(displayProfile) == cmsSigRgbData)
-                    m_iccTransform = LCMSTransformPtr(cmsCreateTransform(iccProfile.get(), TYPE_BGRA_8, displayProfile, TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
+            if (iccProfile && cmsGetColorSpace(iccProfile.get()) == cmsSigRgbData) {
+                auto srgbProfile = LCMSProfilePtr(cmsCreate_sRGBProfile());
+                m_iccTransform = LCMSTransformPtr(cmsCreateTransform(iccProfile.get(), TYPE_BGRA_8, srgbProfile.get(), TYPE_BGRA_8, INTENT_RELATIVE_COLORIMETRIC, 0));
             }
         }
     }