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

[yong.li at torchmobile.com]

The following commit has been merged in the webkit-1.2 branch:
commit b4e9464ebc5229e55b792d06ea629c69f44b4aba
Author: yong.li at torchmobile.com <yong.li at torchmobile.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 20:15:35 2010 +0000

    2010-01-06  Yong Li  <yoli at rim.com>
    
            Reviewed by Darin Adler.
    
            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@52862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fb5eba4..a7d30a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-06  Yong Li  <yoli at rim.com>
+
+        Reviewed by Darin Adler.
+
+        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  Eric Seidel  <eric at webkit.org>
 
         No review, rolling out r52855.
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