Changeset 105230 in webkit

Timestamp:

Jan 17, 2012 7:09:16 PM (12 years ago)

Author:

kbr@google.com

Message:

[chromium] Apply color profiles in more cases
​https://bugs.webkit.org/show_bug.cgi?id=76498

Reviewed by Stephen White.

Not adding new tests, as application of the color profile is not
guaranteed for images used as textures in WebGL. Ran existing
WebGL layout tests; all pass.

• platform/image-decoders/skia/ImageDecoderSkia.cpp:

(WebCore::ImageFrame::setStatus):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/skia/ImageDecoderSkia.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-17  Kenneth Russell  <kbr@google.com>
+
+        [chromium] Apply color profiles in more cases
+        https://bugs.webkit.org/show_bug.cgi?id=76498
+
+        Reviewed by Stephen White.
+
+        Not adding new tests, as application of the color profile is not
+        guaranteed for images used as textures in WebGL. Ran existing
+        WebGL layout tests; all pass.
+
+        * platform/image-decoders/skia/ImageDecoderSkia.cpp:
+        (WebCore::ImageFrame::setStatus):
+
 2012-01-17  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp

@@ -161 +161 @@
         // resolveColorSpace() and callees assume that the alpha channel is
         // premultiplied, so don't apply the color profile if it isn't.
-        if (m_colorProfile.isEmpty() || !m_premultiplyAlpha)
+        if (m_colorProfile.isEmpty() || (!m_premultiplyAlpha && hasAlpha()))
             return;
         RetainPtr<CGColorSpaceRef> cgColorSpace(AdoptCF, createColorSpace(m_colorProfile));