[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-34-g43a6bb2
Gustavo Noronha Silva
gustavo.noronha at collabora.co.uk
Wed Oct 7 06:25:37 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit ceb2e0a71a56768d144c861c38da813713e52860
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 34cffaf..fc90b83 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,21 @@
-2009-09-24 Simon Fraser <simon.fraser at apple.com>
+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-21 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dan Bernstein.
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;"> </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;"> </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
More information about the Pkg-webkit-commits
mailing list