[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[levin at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 96c06fac77e32d566b2966594e0a9da3e91d62b0
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 21:21:24 2011 +0000

    2011-01-03  David Levin  <levin at chromium.org>
    
            Reviewed by Eric Seidel.
    
            check-webkit-style shouldn't consider "value" automatically to be a meaningless name.
            https://bugs.webkit.org/show_bug.cgi?id=51842
    
            * Scripts/webkitpy/style/checkers/cpp.py: Remove the check for value.
            * Scripts/webkitpy/style/checkers/cpp_unittest.py: Remove the test for value.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6163d1c..4b841d8 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-03  David Levin  <levin at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        check-webkit-style shouldn't consider "value" automatically to be a meaningless name.
+        https://bugs.webkit.org/show_bug.cgi?id=51842
+
+        * Scripts/webkitpy/style/checkers/cpp.py: Remove the check for value.
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py: Remove the test for value.
+
 2011-01-03  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py
index 58c13df..aa1a8f0 100644
--- a/Tools/Scripts/webkitpy/style/checkers/cpp.py
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py
@@ -1529,18 +1529,11 @@ def check_function_definition(clean_lines, line_number, function_state, error):
         if len(parameter_list) == 1 and match('set[A-Z]', function_state.current_function):
             trimmed_function_name = function_state.current_function[len('set'):]
             if not _check_parameter_name_against_text(parameter, trimmed_function_name, error):
-                # Since an error was noted for this name, move to the next parameter.
-                continue
+                continue  # Since an error was noted for this name, move to the next parameter.
 
         # Check the parameter name against the type.
         if not _check_parameter_name_against_text(parameter, parameter.type, error):
-            continue
-
-        # Skip single letter parameters before comparing against value (because 'a' would
-        # be flagged, but it may be an ok variable when used in an rgba function).
-        if len(parameter.name) > 1:
-            # 'value' is a meaningless variable name that is used in some places, so flag it.
-            _check_parameter_name_against_text(parameter, 'value', error)
+            continue  # Since an error was noted for this name, move to the next parameter.
 
 
 def check_pass_ptr_usage(clean_lines, line_number, function_state, error):
diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
index bb0579e..22d07e3 100644
--- a/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py
@@ -4163,10 +4163,6 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assertEquals(meaningless_variable_name_error_message % 'rvo',
                           self.perform_lint('void funct(RenderView rvo);', 'test.cpp', parameter_error_rules))
 
-        # 'value' is a meaningless variable name.
-        self.assertEquals(meaningless_variable_name_error_message % 'value',
-                          self.perform_lint('void funct(RenderView value);', 'test.cpp', parameter_error_rules))
-
         # Check that r, g, b, and a are allowed.
         self.assertEquals('',
                           self.perform_lint('void setRGBAValues(int r, int g, int b, int a);', 'test.cpp', parameter_error_rules))

-- 
WebKit Debian packaging