Changeset 71071 in webkit

Timestamp:

Nov 1, 2010 4:25:50 PM (13 years ago)

Author:

dimich@chromium.org

Message:

2010-11-01 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r71065.
​http://trac.webkit.org/changeset/71065
​https://bugs.webkit.org/show_bug.cgi?id=48801

Seem to breake a lot of tests on Chromium bots (Requested by
dimich on #webkit).

• platform/image-decoders/ImageDecoder.cpp:
• platform/image-decoders/ImageDecoder.h:
• platform/image-decoders/cg/ImageDecoderCG.cpp: (WebCore::RGBA32Buffer::asNewNativeImage):
• platform/image-decoders/png/PNGImageDecoder.cpp: (WebCore::PNGImageDecoder::headerAvailable): (WebCore::PNGImageDecoder::rowAvailable):
• platform/image-decoders/qt/RGBA32BufferQt.cpp:
• platform/image-decoders/skia/ImageDecoderSkia.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (4 diffs)
• platform/image-decoders/cg/ImageDecoderCG.cpp (modified) (1 diff)
• platform/image-decoders/png/PNGImageDecoder.cpp (modified) (3 diffs)
• platform/image-decoders/qt/RGBA32BufferQt.cpp (modified) (2 diffs)
• platform/image-decoders/skia/ImageDecoderSkia.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r71065.
+        http://trac.webkit.org/changeset/71065
+        https://bugs.webkit.org/show_bug.cgi?id=48801
+
+        Seem to breake a lot of tests on Chromium bots (Requested by
+        dimich on #webkit).
+
+        * platform/image-decoders/ImageDecoder.cpp:
+        * platform/image-decoders/ImageDecoder.h:
+        * platform/image-decoders/cg/ImageDecoderCG.cpp:
+        (WebCore::RGBA32Buffer::asNewNativeImage):
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageDecoder::headerAvailable):
+        (WebCore::PNGImageDecoder::rowAvailable):
+        * platform/image-decoders/qt/RGBA32BufferQt.cpp:
+        * platform/image-decoders/skia/ImageDecoderSkia.cpp:
+
 2010-11-01  Matthew Delaney  <mdelaney@apple.com>
 

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

@@ -188 +188 @@
 {
     m_hasAlpha = alpha;
-}
-
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
-    m_colorProfile = colorProfile;
 }
 

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

@@ -47 +47 @@
 namespace WebCore {
 
-    // FIXME: Do we want better encapsulation?
-    typedef Vector<char> ColorProfile;
-
     // The RGBA32Buffer object represents the decoded image data in RGBA32
     // format.  This buffer is what all decoders write a single frame into.
@@ -129 +126 @@
 
         void setHasAlpha(bool alpha);
-        void setColorProfile(const ColorProfile&);
         void setRect(const IntRect& r) { m_rect = r; }
         void setStatus(FrameStatus status);
@@ -197 +193 @@
         bool m_hasAlpha; // Whether or not any of the pixels in the buffer
                          // have transparency.
-        ColorProfile m_colorProfile;
 #endif
         IntRect m_rect; // The rect of the original specified frame within
@@ -350 +345 @@
         RefPtr<SharedBuffer> m_data; // The encoded data.
         Vector<RGBA32Buffer> m_frameBufferCache;
-        ColorProfile m_colorProfile;
         bool m_scaled;
         Vector<int> m_scaledColumns;

trunk/WebCore/platform/image-decoders/cg/ImageDecoderCG.cpp

@@ -65 +65 @@
 }
 
-static CGColorSpaceRef createColorSpace(const ColorProfile& colorProfile)
-{
-    if (colorProfile.isEmpty())
-        return CGColorSpaceCreateDeviceRGB();
-
-    RetainPtr<CFDataRef> data(AdoptCF, CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(colorProfile.data()), colorProfile.size()));
-#if !defined(TARGETING_TIGER) && !defined(TARGETING_LEOPARD)
-    return CGColorSpaceCreateWithICCProfile(data.get());
-#else
-    RetainPtr<CGColorSpaceRef> deviceColorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
-    RetainPtr<CGDataProviderRef> profileDataProvider(AdoptCF, CGDataProviderCreateWithCFData(data.get()));
-    CGFloat ranges[] = {0.0, 255.0, 0.0, 255.0, 0.0, 255.0};
-    return CGColorSpaceCreateICCBased(3, ranges, profileDataProvider.get(), deviceColorSpace.get());
-#endif
-}
-
 NativeImagePtr RGBA32Buffer::asNewNativeImage() const
 {
-    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, createColorSpace(m_colorProfile));
+    // FIXME: Figure out the right color space.
+    DEFINE_STATIC_LOCAL(RetainPtr<CGColorSpaceRef>, deviceColorSpace, (AdoptCF, CGColorSpaceCreateDeviceRGB()));
     RetainPtr<CGDataProviderRef> dataProvider(AdoptCF, CGDataProviderCreateWithCFData(m_backingStore.get()));
 
     CGImageAlphaInfo alphaInfo = m_premultiplyAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaFirst;
 
-    return CGImageCreate(width(), height(), 8, 32, width() * sizeof(PixelData), colorSpace.get(),
+    return CGImageCreate(width(), height(), 8, 32, width() * sizeof(PixelData), deviceColorSpace.get(),
         alphaInfo | kCGBitmapByteOrder32Host, dataProvider.get(), 0, false, kCGRenderingIntentDefault);
 }

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

@@ -221 +221 @@
 }
 
-static ColorProfile readColorProfile(png_structp png, png_infop info)
-{
-#ifdef PNG_iCCP_SUPPORTED
-    char* profileName;
-    int compressionType;
-    char* profile;
-    png_uint_32 profileLength;
-    png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength);
-    if (profile) {
-        ColorProfile colorProfile;
-        colorProfile.append(profile, profileLength);
-        return colorProfile;
-    }
-#endif
-    return ColorProfile();
-}
-
 void PNGImageDecoder::headerAvailable()
 {
@@ -267 +250 @@
     png_get_IHDR(png, info, &width, &height, &bitDepth, &colorType, &interlaceType, &compressionType, &filterType);
 
-    m_colorProfile = readColorProfile(png, info);
-
     // The options we set here match what Mozilla does.
 
@@ -331 +312 @@
         buffer.setStatus(RGBA32Buffer::FramePartial);
         buffer.setHasAlpha(false);
-        buffer.setColorProfile(m_colorProfile);
 
         // For PNGs, the frame always fills the entire image.

trunk/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp

@@ -28 +28 @@
 #include "config.h"
 #include "ImageDecoder.h"
-
-#include "NotImplemented.h"
 
 #include <QPixmap>
@@ -127 +125 @@
 }
 
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
-    notImplemented();
-}
-
 void RGBA32Buffer::setStatus(FrameStatus status)
 {

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

@@ -27 +27 @@
 #include "config.h"
 #include "ImageDecoder.h"
-
-#include "NotImplemented.h"
 
 namespace WebCore {
@@ -112 +110 @@
 }
 
-void RGBA32Buffer::setColorProfile(const ColorProfile& colorProfile)
-{
-    notImplemented();
-}
-
 void RGBA32Buffer::setStatus(FrameStatus status)
 {