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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b9aa2476a249b10d5f5d02aa5046607896907a8a
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 20:16:54 2010 +0000

    2010-11-15  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Andreas Kling.
    
            [GTK] gdk_pixbuf_get_from_surface from GtkVersioning.h is broken on GTK+ 2 builds
            https://bugs.webkit.org/show_bug.cgi?id=49549
    
            No new tests. This can be verified by loading any existing vertical text test
            in GtkLauncher and noticing the lack of CRITICAL GLib exceptions. There's currently
            no automatic way of verifying custom cursors.
    
            * platform/gtk/GtkVersioning.c:
            (gdk_pixbuf_get_from_surface): Reverse a sanity check in this method to be correct.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index add3ec6..4f3fe13 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-15  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Andreas Kling.
+
+        [GTK] gdk_pixbuf_get_from_surface from GtkVersioning.h is broken on GTK+ 2 builds
+        https://bugs.webkit.org/show_bug.cgi?id=49549
+
+        No new tests. This can be verified by loading any existing vertical text test
+        in GtkLauncher and noticing the lack of CRITICAL GLib exceptions. There's currently
+        no automatic way of verifying custom cursors.
+
+        * platform/gtk/GtkVersioning.c:
+        (gdk_pixbuf_get_from_surface): Reverse a sanity check in this method to be correct.
+
 2010-11-12  Jer Noble  <jer.noble at apple.com>
 
         Reviewed by Brady Eidson.
diff --git a/WebCore/platform/gtk/GtkVersioning.c b/WebCore/platform/gtk/GtkVersioning.c
index 071c5e5..0776c10 100644
--- a/WebCore/platform/gtk/GtkVersioning.c
+++ b/WebCore/platform/gtk/GtkVersioning.c
@@ -225,7 +225,7 @@ gdk_pixbuf_get_from_surface(cairo_surface_t * surface,
     GdkPixbuf * dest;
 
     /* General sanity checks */
-    g_return_val_if_fail(!surface, NULL);
+    g_return_val_if_fail(surface, NULL);
     g_return_val_if_fail(srcX >= 0 && srcY >= 0, NULL);
     g_return_val_if_fail(width > 0 && height > 0, NULL);
 

-- 
WebKit Debian packaging