[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6f6db06bbadb02d94b6aca6f1000b83bf7a1053e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 18:22:08 2009 +0000

    2009-12-20  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Adam Barth.
    
            [check-webkit-style] static_cast is not misnamed!
            https://bugs.webkit.org/show_bug.cgi?id=32796
    
            * Scripts/modules/cpp_style.py:
            * Scripts/modules/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52423 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7fdd303..614121c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-20  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [check-webkit-style] static_cast is not misnamed!
+        https://bugs.webkit.org/show_bug.cgi?id=32796
+
+        * Scripts/modules/cpp_style.py:
+        * Scripts/modules/cpp_style_unittest.py:
+
 2009-12-20  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKitTools/Scripts/modules/cpp_style.py b/WebKitTools/Scripts/modules/cpp_style.py
index 4fba777..c355001 100644
--- a/WebKitTools/Scripts/modules/cpp_style.py
+++ b/WebKitTools/Scripts/modules/cpp_style.py
@@ -2646,7 +2646,7 @@ def check_identifier_name_in_declaration(filename, line_number, line, error):
       error: The function to call with any errors found.
     """
     # We don't check a return statement.
-    if match(r'\s*return\b', line):
+    if match(r'\s*(return|delete)\b', line):
         return
 
     # Basically, a declaration is a type name followed by whitespaces
diff --git a/WebKitTools/Scripts/modules/cpp_style_unittest.py b/WebKitTools/Scripts/modules/cpp_style_unittest.py
index 53e1205..5e03df5 100644
--- a/WebKitTools/Scripts/modules/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/modules/cpp_style_unittest.py
@@ -3658,6 +3658,7 @@ class WebKitStyleTest(CppStyleTestBase):
                          'under_score' + name_error_message)
         self.assert_lint('goto under_score;',
                          'under_score' + name_error_message)
+        self.assert_lint('delete static_cast<Foo*>(p);', '')
 
         # Multiple variables in one line.
         self.assert_lint('void myFunction(int variable1, int another_variable);',

-- 
WebKit Debian packaging