[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 80b9507c2bc882dc50edfd76bd9472dc6cf6521a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 00:26:46 2010 +0000

    2010-01-06  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Rolling back in a change I should not have rolled out.
    
            The original commit http://trac.webkit.org/changeset/52862
            was rolled out again in http://trac.webkit.org/changeset/52871
            but I now believe that rollout to be in error.
            My sincerest apologies for the churn.
    
            Fix the bug in previous commit: we shouldn't finish
            decoding if "sizeOnly" is true.
            https://bugs.webkit.org/show_bug.cgi?id=33258
    
            * platform/image-decoders/png/PNGImageDecoder.cpp:
            (WebCore::PNGImageReader::decode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2a3342..53a02f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-06  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Rolling back in a change I should not have rolled out.
+
+        The original commit http://trac.webkit.org/changeset/52862
+        was rolled out again in http://trac.webkit.org/changeset/52871
+        but I now believe that rollout to be in error.
+        My sincerest apologies for the churn.
+
+        Fix the bug in previous commit: we shouldn't finish
+        decoding if "sizeOnly" is true.
+        https://bugs.webkit.org/show_bug.cgi?id=33258
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageReader::decode):
+
 2010-01-06  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index fa2c8b6..d2705f9 100644
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -119,7 +119,7 @@ public:
             m_currentBufferSize = m_readOffset;
             png_process_data(m_png, m_info, reinterpret_cast<png_bytep>(const_cast<char*>(segment)), segmentLength);
             if ((sizeOnly && decoder->isSizeAvailable()) || m_hasFinishedDecoding)
-                break;
+                return;
         }
         if (!m_hasFinishedDecoding && decoder->isAllDataReceived())
             decoder->pngComplete();

-- 
WebKit Debian packaging