[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

philn at webkit.org philn at webkit.org
Thu Feb 4 21:35:07 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 3b02bbfd38d642d3478f097d4967e2f54049b854
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 1 08:50:12 2010 +0000

    2010-02-01  Philippe Normand  <pnormand at igalia.com>
    
            Rubber stamped by Xan Lopez.
    
            Fixed compilation warning about unsigned vs signed comparison.
    
            * plugins/gtk/PluginViewGtk.cpp:
            (WebCore::PluginView::paint):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f2e6b80..d4ff396 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-01  Philippe Normand  <pnormand at igalia.com>
+
+        Rubber stamped by Xan Lopez.
+
+        Fixed compilation warning about unsigned vs signed comparison.
+
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::paint):
+
 2010-01-31  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed. Revert r54112 and r54124 because of Windows build error.
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index c473c35..8f4b2d5 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -215,7 +215,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect)
     XGetGeometry(GDK_DISPLAY(), m_drawable, &dummyW, &dummyI, &dummyI,
                  &dummyUI, &dummyUI, &dummyUI, &actualDepth);
 
-    const int drawableDepth = ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth;
+    const unsigned int drawableDepth = ((NPSetWindowCallbackStruct*)m_npWindow.ws_info)->depth;
     ASSERT(drawableDepth == actualDepth);
 
     cairo_surface_t* drawableSurface = cairo_xlib_surface_create(GDK_DISPLAY(),

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list