[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit b36caa615888f86fe51abd9369025b78d4f6a401
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 19:50:34 2010 +0000

    2010-03-02  Fridrich Strba  <fridrich.strba at bluewin.ch>
    
            Reviewed by Xan Lopez.
    
            Use unsigned instead of uint which does not exist on windows
            https://bugs.webkit.org/show_bug.cgi?id=35546
    
            * platform/graphics/gtk/ImageGtk.cpp:
            (WebCore::getCairoSurfacePixel):
            (WebCore::getGdkPixbufPixel):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55420 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e9d9a98..9f84169 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Fridrich Strba  <fridrich.strba at bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Use unsigned instead of uint which does not exist on windows
+        https://bugs.webkit.org/show_bug.cgi?id=35546
+
+        * platform/graphics/gtk/ImageGtk.cpp:
+        (WebCore::getCairoSurfacePixel):
+        (WebCore::getGdkPixbufPixel):
+
 2010-03-02  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/gtk/ImageGtk.cpp b/WebCore/platform/graphics/gtk/ImageGtk.cpp
index c62d988..9c41369 100644
--- a/WebCore/platform/graphics/gtk/ImageGtk.cpp
+++ b/WebCore/platform/graphics/gtk/ImageGtk.cpp
@@ -107,12 +107,12 @@ PassRefPtr<Image> Image::loadPlatformThemeIcon(const char* name, int size)
     return loadImageFromFile(getThemeIconFileName(name, size));
 }
 
-static inline unsigned char* getCairoSurfacePixel(unsigned char* data, uint x, uint y, uint rowStride)
+static inline unsigned char* getCairoSurfacePixel(unsigned char* data, unsigned x, unsigned y, unsigned rowStride)
 {
     return data + (y * rowStride) + x * 4;
 }
 
-static inline guchar* getGdkPixbufPixel(guchar* data, uint x, uint y, uint rowStride)
+static inline guchar* getGdkPixbufPixel(guchar* data, unsigned x, unsigned y, unsigned rowStride)
 {
     return data + (y * rowStride) + x * 4;
 }

-- 
WebKit Debian packaging