[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 039e0bceb0f3cea4b8700360efea0575d351f442
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 01:50:40 2010 +0000

    2010-07-27  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by David Levin.
    
            Stylebot should not complain about NULL usage in calls to gdk_pixbuf_save_to
            https://bugs.webkit.org/show_bug.cgi?id=43090
    
            * Scripts/webkitpy/style/checkers/cpp.py: Add exemption for some GdkPixbuf methods.
            * Scripts/webkitpy/style/checkers/cpp_unittest.py: Added some tests for this behavior.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e7506f7..502ceb3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-27  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by David Levin.
+
+        Stylebot should not complain about NULL usage in calls to gdk_pixbuf_save_to
+        https://bugs.webkit.org/show_bug.cgi?id=43090
+
+        * Scripts/webkitpy/style/checkers/cpp.py: Add exemption for some GdkPixbuf methods.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py: Added some tests for this behavior.
+
 2010-07-27  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, trivial typo fix.
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
index 611afdc..ebb792d 100644
--- a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
+++ b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
@@ -1884,6 +1884,10 @@ def check_for_null(file_extension, clean_lines, line_number, error):
     if search(r'\bg_str(join|concat)\b', line):
         return
 
+    # Don't warn about NULL usage in gdk_pixbuf_save_to_*{join,concat}(). See Bug 43090.
+    if search(r'\bgdk_pixbuf_save_to\w+\b', line):
+        return
+
     if search(r'\bNULL\b', line):
         error(line_number, 'readability/null', 5, 'Use 0 instead of NULL.')
         return
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
index 2dde549..b5584d0 100644
--- a/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
@@ -3472,6 +3472,15 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assert_lint(
             'gchar* result = g_strjoin(",", "part1", NULL);',
             '')
+        self.assert_lint(
+            'gchar* result = gdk_pixbuf_save_to_callback(pixbuf, function, data, type, error, NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = gdk_pixbuf_save_to_buffer(pixbuf, function, data, type, error, NULL);',
+            '')
+        self.assert_lint(
+            'gchar* result = gdk_pixbuf_save_to_stream(pixbuf, function, data, type, error, NULL);',
+            '')
 
         # 2. C++ and C bool values should be written as true and
         #    false. Objective-C BOOL values should be written as YES and NO.

-- 
WebKit Debian packaging