[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[pkasting at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit fa47245c7b8f1b7534e6f87e8034d0794121faf0
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 19:51:24 2010 +0000

    Unreviewed, build fix.
    
    Fix crashes due to an omitted line in r54839.
    
    * platform/image-decoders/png/PNGImageDecoder.cpp:
    (WebCore::decodingFailed):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54905 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3e2f09c..fc481ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-17  Peter Kasting  <pkasting at google.com>
+
+        Unreviewed, build fix.
+
+        Fix crashes due to an omitted line in r54839.
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::decodingFailed):
+
 2010-02-17  Alok Priyadarshi  <alokp at chromium.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
index c51d89f..36f818f 100644
--- a/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -54,6 +54,7 @@ const unsigned long cMaxPNGSize = 1000000UL;
 // Called if the decoding of the image fails.
 static void PNGAPI decodingFailed(png_structp png, png_const_charp)
 {
+    static_cast<PNGImageDecoder*>(png_get_progressive_ptr(png))->decodingFailed();
     longjmp(png->jmpbuf, 1);
 }
 

-- 
WebKit Debian packaging