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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 53f8c556305ec90b93362bc9d0f38797474c978a
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 22:06:22 2010 +0000

    2010-09-29  Tony Chang  <tony at chromium.org>
    
            Reviewed by James Robinson.
    
            [chromium] enable -Werror on chromium linux webkit
            https://bugs.webkit.org/show_bug.cgi?id=46821
    
            * WebKit.gyp:
            * src/gtk/WebInputEventFactory.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 2e1c673..f7f16d3 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-29  Tony Chang  <tony at chromium.org>
+
+        Reviewed by James Robinson.
+
+        [chromium] enable -Werror on chromium linux webkit
+        https://bugs.webkit.org/show_bug.cgi?id=46821
+
+        * WebKit.gyp:
+        * src/gtk/WebInputEventFactory.cpp:
+
 2010-09-29  Mihai Parparita  <mihaip at chromium.org>
 
         Unreviewed removal of unused #define from WebHistory.h.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 4f2b93f..af59c32 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -604,11 +604,6 @@
                     'sources/': [
                         ['exclude', 'Skia\\.cpp$'],
                     ],
-                    'variables': {
-                        # FIXME: Turn on warnings on other platforms and for
-                        # other targets.
-                        'chromium_code': 1,
-                    }
                 }, { # else: OS!="mac"
                     'sources/': [
                         ['exclude', '/mac/'],
@@ -621,6 +616,10 @@
                     ],
                 }, { # else: OS!="win"
                     'sources/': [['exclude', '/win/']],
+                    'variables': {
+                        # FIXME: Turn on warnings on Windows.
+                        'chromium_code': 1,
+                    }
                 }],
                 ['"ENABLE_3D_CANVAS=1" in feature_defines', {
                     'conditions': [
diff --git a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
index 0d55c43..71d1b39 100644
--- a/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
+++ b/WebKit/chromium/src/gtk/WebInputEventFactory.cpp
@@ -52,7 +52,7 @@ bool countsAsDoubleClick(gint timeDiff, gint xDiff, gint yDiff)
     gint doubleClickDistance = 5;
     g_object_get(G_OBJECT(settings),
                  "gtk-double-click-time", &doubleClickTime,
-                 "gtk-double-click-distance", &doubleClickDistance, 0);
+                 "gtk-double-click-distance", &doubleClickDistance, NULL);
     return timeDiff <= doubleClickTime && abs(xDiff) <= doubleClickDistance && abs(yDiff) <= doubleClickDistance;
 }
 

-- 
WebKit Debian packaging