[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b59910cbceb955466e48f51875987fb6c3d0045d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 20:48:40 2010 +0000

    2010-11-02  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r71152.
            http://trac.webkit.org/changeset/71152
            https://bugs.webkit.org/show_bug.cgi?id=48866
    
            Causes lots and lots of crashes (Requested by jamesr_ on
            #webkit).
    
            * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
            (WebCore::JPEGImageReader::JPEGImageReader):
            (WebCore::JPEGImageReader::decode):
            (WebCore::JPEGImageDecoder::outputScanlines):
            * platform/image-decoders/jpeg/JPEGImageDecoder.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71162 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9865419..74a300e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-02  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r71152.
+        http://trac.webkit.org/changeset/71152
+        https://bugs.webkit.org/show_bug.cgi?id=48866
+
+        Causes lots and lots of crashes (Requested by jamesr_ on
+        #webkit).
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::JPEGImageReader::JPEGImageReader):
+        (WebCore::JPEGImageReader::decode):
+        (WebCore::JPEGImageDecoder::outputScanlines):
+        * platform/image-decoders/jpeg/JPEGImageDecoder.h:
+
 2010-11-02  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index f40556b..6c6c782 100644
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -51,13 +51,7 @@
 #endif
 
 extern "C" {
-
 #include "jpeglib.h"
-
-#if USE(ICCJPEG)
-#include "iccjpeg.h"
-#endif
-
 }
 
 #include <setjmp.h>
@@ -92,24 +86,6 @@ struct decoder_source_mgr {
     JPEGImageReader* decoder;
 };
 
-static ColorProfile readColorProfile(jpeg_decompress_struct* info)
-{
-#if USE(ICCJPEG)
-    JOCTET* profile;
-    unsigned int profileLength;
-
-    if (!read_icc_profile(info, &profile, &profileLength))
-        return ColorProfile();
-
-    ColorProfile colorProfile;
-    colorProfile.append(reinterpret_cast<char*>(profile), profileLength);
-    free(profile);
-    return colorProfile;
-#else
-    return ColorProfile();
-#endif
-}
-
 class JPEGImageReader
 {
 public:
@@ -147,10 +123,6 @@ public:
         src->pub.resync_to_restart = jpeg_resync_to_restart;
         src->pub.term_source = term_source;
         src->decoder = this;
-
-        // Enable these markers for the ICC color profile.
-        for (unsigned i = JPEG_APP0; i < JPEG_COM; ++i)
-            jpeg_save_markers(&m_info, i, 0xFFFF);
     }
 
     ~JPEGImageReader()
@@ -240,8 +212,6 @@ public:
             if (!m_decoder->setSize(m_info.image_width, m_info.image_height))
                 return false;
 
-            m_decoder->setColorProfile(readColorProfile(info()));              
-
             if (m_decodingSizeOnly) {
                 // We can stop here.  Reduce our buffer length and available
                 // data.
@@ -451,7 +421,6 @@ bool JPEGImageDecoder::outputScanlines()
             return setFailed();
         buffer.setStatus(RGBA32Buffer::FramePartial);
         buffer.setHasAlpha(false);
-        buffer.setColorProfile(m_colorProfile);
 
         // For JPEGs, the frame always fills the entire image.
         buffer.setRect(IntRect(IntPoint(), size()));
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h
index e942b01..5047019 100644
--- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h
+++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h
@@ -54,8 +54,6 @@ namespace WebCore {
         bool outputScanlines();
         void jpegComplete();
 
-        void setColorProfile(const ColorProfile& colorProfile) { m_colorProfile = colorProfile; }
-
     private:
         // Decodes the image.  If |onlySize| is true, stops decoding after
         // calculating the image size.  If decoding fails but there is no more

-- 
WebKit Debian packaging