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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit ada76a83965bb72b209398d9cea7fd84e7f47bc6
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 30 14:49:54 2010 +0000

    2010-10-30  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt][WK2] Crash in drawUpdateChunkIntoBackingStore
            https://bugs.webkit.org/show_bug.cgi?id=48707
    
            UpdateChunk images have to be created using the QImage constructor
            that takes a bytesPerLine (stride) value, or the data length won't
            match UpdateChunk::size().
    
            * Shared/qt/UpdateChunk.cpp:
            (WebKit::UpdateChunk::createImage):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 402dd9d..757b499 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-30  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] Crash in drawUpdateChunkIntoBackingStore
+        https://bugs.webkit.org/show_bug.cgi?id=48707
+
+        UpdateChunk images have to be created using the QImage constructor
+        that takes a bytesPerLine (stride) value, or the data length won't
+        match UpdateChunk::size().
+
+        * Shared/qt/UpdateChunk.cpp:
+        (WebKit::UpdateChunk::createImage):
+
 2010-10-29  Daniel Bates  <dbates at rim.com>
 
         No review, rolling out 70971.
diff --git a/WebKit2/Shared/qt/UpdateChunk.cpp b/WebKit2/Shared/qt/UpdateChunk.cpp
index c7776ab..3d2ce31 100644
--- a/WebKit2/Shared/qt/UpdateChunk.cpp
+++ b/WebKit2/Shared/qt/UpdateChunk.cpp
@@ -92,7 +92,7 @@ bool UpdateChunk::decode(CoreIPC::ArgumentDecoder* decoder, UpdateChunk& chunk)
 
 QImage UpdateChunk::createImage()
 {
-    return QImage(data(), m_rect.width(), m_rect.height(), QImage::Format_RGB32);
+    return QImage(data(), m_rect.width(), m_rect.height(), m_rect.width() * 4, QImage::Format_RGB32);
 }
 
 } // namespace WebKit

-- 
WebKit Debian packaging