[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[oliver at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 929f10becfcf8239bb8307f25645319846b26504
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 18:40:51 2009 +0000

    [GTK] REGRESSION: BitmapImage::getGdkPixbuf fails for non-square images
    https://bugs.webkit.org/show_bug.cgi?id=29654
    
    Patch by Martin Robinson  <martin.james.robinson at gmail.com>
    Reviewed by Eric Seidel
    
    Added an additional manual-test for this issue to the existing Gtk
    cursor image test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e65df6b..9d802be 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-22  Martin Robinson  <martin.james.robinson at gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        Fix corruption for non-square images.
+
+        [GTK] REGRESSION: BitmapImage::getGdkPixbuf fails for non-square images
+        https://bugs.webkit.org/show_bug.cgi?id=29654
+
+        Added an additional manual-test for this issue to the existing Gtk
+        cursor image test.
+
+        * manual-tests/gtk/cursor-image.html:
+        * manual-tests/gtk/resources/long_cell.cur: Added.
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (WebCore::BitmapImage::getGdkPixbuf):
+
 2009-09-29  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/manual-tests/gtk/cursor-image.html b/WebCore/manual-tests/gtk/cursor-image.html
index 2712728..a231337 100644
--- a/WebCore/manual-tests/gtk/cursor-image.html
+++ b/WebCore/manual-tests/gtk/cursor-image.html
@@ -1,2 +1,4 @@
-<div>Mouse over the grey blocks to change the cursor to a small cross.</div>
+<div>Mouse over the grey block below to change the cursor to a small cross.</div>
 <div style="width: 100px; height: 100px; background: lightblue; cursor:url(resources/cell.cur), default;">&nbsp;</div>
+<div>Mouse over the grey block below to change the cursor to three small crosses.</div>
+<div style="width: 100px; height: 100px; background: lightblue; cursor:url(resources/long_cell.cur), default;">&nbsp;</div>
diff --git a/WebCore/platform/graphics/gtk/ImageGtk.cpp b/WebCore/platform/graphics/gtk/ImageGtk.cpp
index 669cbd4..38da70d 100644
--- a/WebCore/platform/graphics/gtk/ImageGtk.cpp
+++ b/WebCore/platform/graphics/gtk/ImageGtk.cpp
@@ -128,7 +128,7 @@ GdkPixbuf* BitmapImage::getGdkPixbuf()
      * if this machine is little-endian.
      */
     for (int y = 0; y < height; y++) {
-        for (int x = 0; x < height; x++) {
+        for (int x = 0; x < width; x++) {
             unsigned char* source = getCairoSurfacePixel(surfaceData, x, y, surfaceRowStride);
             guchar* dest = getGdkPixbufPixel(pixbufData, x, y, pixbufRowStride);
 

-- 
WebKit Debian packaging