Changeset 205661 in webkit

Timestamp:

Sep 8, 2016 2:16:38 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Get rid of the color profile from ImageFrame and ImageDecoder
​https://bugs.webkit.org/show_bug.cgi?id=159699

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2016-09-08
Reviewed by Simon Fraser.

The color profile is set but it is never used.

• platform/image-decoders/ImageDecoder.cpp:

(WebCore::ImageFrame::setColorProfile): Deleted.

• platform/image-decoders/ImageDecoder.h:
• platform/image-decoders/jpeg/JPEGImageDecoder.cpp:

(WebCore::JPEGImageReader::decode):
(WebCore::JPEGImageDecoder::outputScanlines):
(WebCore::readColorProfile): Deleted.

• platform/image-decoders/jpeg/JPEGImageDecoder.h:
• platform/image-decoders/png/PNGImageDecoder.cpp:

(WebCore::PNGImageDecoder::headerAvailable):
(WebCore::PNGImageDecoder::rowAvailable):
(WebCore::readColorProfile): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (3 diffs)
• platform/image-decoders/jpeg/JPEGImageDecoder.cpp (modified) (3 diffs)
• platform/image-decoders/jpeg/JPEGImageDecoder.h (modified) (1 diff)
• platform/image-decoders/png/PNGImageDecoder.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-08  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Get rid of the color profile from ImageFrame and ImageDecoder
+        https://bugs.webkit.org/show_bug.cgi?id=159699
+
+        Reviewed by Simon Fraser.
+
+        The color profile is set but it is never used.
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        (WebCore::ImageFrame::setColorProfile): Deleted.
+        * platform/image-decoders/ImageDecoder.h:
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::JPEGImageReader::decode):
+        (WebCore::JPEGImageDecoder::outputScanlines):
+        (WebCore::readColorProfile): Deleted.
+        * platform/image-decoders/jpeg/JPEGImageDecoder.h:
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageDecoder::headerAvailable):
+        (WebCore::PNGImageDecoder::rowAvailable):
+        (WebCore::readColorProfile): Deleted.
+
 2016-09-08  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp

@@ -221 +221 @@
 }
 
-void ImageFrame::setColorProfile(const ColorProfile& colorProfile)
-{
-    m_colorProfile = colorProfile;
-}
-
 void ImageFrame::setStatus(FrameStatus status)
 {

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

@@ -111 +111 @@
 
         void setHasAlpha(bool alpha);
-        void setColorProfile(const ColorProfile&);
         void setOriginalFrameRect(const IntRect& r) { m_originalFrameRect = r; }
         void setStatus(FrameStatus status);
@@ -215 +214 @@
         PixelData* m_bytes; // The memory is backed by m_backingStore.
         IntSize m_size;
-        // FIXME: Do we need m_colorProfile anymore?
-        ColorProfile m_colorProfile;
         bool m_hasAlpha;
         IntRect m_originalFrameRect; // This will always just be the entire
@@ -382 +379 @@
         RefPtr<SharedBuffer> m_data; // The encoded data.
         Vector<ImageFrame, 1> m_frameBufferCache;
-        // FIXME: Do we need m_colorProfile any more, for any port?
-        ColorProfile m_colorProfile;
         bool m_scaled { false };
         Vector<int> m_scaledColumns;

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

@@ -197 +197 @@
 }
 
-static ColorProfile readColorProfile(jpeg_decompress_struct* info)
-{
-#if USE(ICCJPEG)
-    JOCTET* profile;
-    unsigned int profileLength;
-
-    if (!read_icc_profile(info, &profile, &profileLength))
-        return ColorProfile();
-
-    // Only accept RGB color profiles from input class devices.
-    bool ignoreProfile = false;
-    char* profileData = reinterpret_cast<char*>(profile);
-    if (profileLength < ImageDecoder::iccColorProfileHeaderLength)
-        ignoreProfile = true;
-    else if (!ImageDecoder::rgbColorProfile(profileData, profileLength))
-        ignoreProfile = true;
-    else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength))
-        ignoreProfile = true;
-
-    ColorProfile colorProfile;
-    if (!ignoreProfile)
-        colorProfile.append(profileData, profileLength);
-    free(profile);
-    return colorProfile;
-#else
-    UNUSED_PARAM(info);
-    return ColorProfile();
-#endif
-}
-
 class JPEGImageReader {
     WTF_MAKE_FAST_ALLOCATED;
@@ -364 +334 @@
                 m_info.out_color_space = JCS_RGB;
 #endif
-            // Allow color management of the decoded RGBA pixels if possible.
-            if (!m_decoder->ignoresGammaAndColorProfile()) {
-                ColorProfile rgbInputDeviceColorProfile = readColorProfile(info());
-                if (!rgbInputDeviceColorProfile.isEmpty())
-                    m_decoder->setColorProfile(rgbInputDeviceColorProfile);
-            }
-
             // Don't allocate a giant and superfluous memory buffer when the
             // image is a sequential JPEG.
@@ -661 +624 @@
         // loading. The completed image will be marked fully opaque in jpegComplete().
         buffer.setHasAlpha(true);
-        buffer.setColorProfile(m_colorProfile);
 
         // For JPEGs, the frame always fills the entire image.

trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h

@@ -67 +67 @@
         void jpegComplete();
 
-        void setColorProfile(const ColorProfile& colorProfile) { m_colorProfile = colorProfile; }
         void setOrientation(ImageOrientation orientation) { m_orientation = orientation; }
 

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

@@ -277 +277 @@
 }
 
-static void readColorProfile(png_structp png, png_infop info, ColorProfile& colorProfile)
-{
-    ASSERT(colorProfile.isEmpty());
-
-#ifdef PNG_iCCP_SUPPORTED
-    char* profileName;
-    int compressionType;
-#if (PNG_LIBPNG_VER < 10500)
-    png_charp profile;
-#else
-    png_bytep profile;
-#endif
-    png_uint_32 profileLength;
-    if (!png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength))
-        return;
-
-    // Only accept RGB color profiles from input class devices.
-    bool ignoreProfile = false;
-    char* profileData = reinterpret_cast<char*>(profile);
-    if (profileLength < ImageDecoder::iccColorProfileHeaderLength)
-        ignoreProfile = true;
-    else if (!ImageDecoder::rgbColorProfile(profileData, profileLength))
-        ignoreProfile = true;
-    else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength))
-        ignoreProfile = true;
-
-    if (!ignoreProfile)
-        colorProfile.append(profileData, profileLength);
-#endif
-}
-
 void PNGImageDecoder::headerAvailable()
 {
@@ -406 +375 @@
         png_set_gray_to_rgb(png);
 
-    if ((colorType & PNG_COLOR_MASK_COLOR) && !m_ignoreGammaAndColorProfile) {
-        // We only support color profiles for color PALETTE and RGB[A] PNG. Supporting
-        // color profiles for gray-scale images is slightly tricky, at least using the
-        // CoreGraphics ICC library, because we expand gray-scale images to RGB but we
-        // do not similarly transform the color profile. We'd either need to transform
-        // the color profile or we'd need to decode into a gray-scale image buffer and
-        // hand that to CoreGraphics.
-        readColorProfile(png, info, m_colorProfile);
-    }
-
     // Deal with gamma and keep it under our control.
     double gamma;
@@ -507 +466 @@
         buffer.setStatus(ImageFrame::FramePartial);
         buffer.setHasAlpha(false);
-        buffer.setColorProfile(m_colorProfile);
 
 #if ENABLE(APNG)