Changeset 155535 in webkit

Timestamp:

Sep 11, 2013 9:43:29 AM (11 years ago)

Author:

andersca@apple.com

Message:

The style checker shouldn't complain about returning or passing OwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=121163

Reviewed by Antti Koivisto.

• Scripts/webkitpy/style/checkers/cpp.py:

(check_function_definition_and_pass_ptr):

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(PassPtrTest.test_pass_ref_ptr_return_value):
(PassPtrTest.test_own_ptr_parameter_value):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-11  Anders Carlsson  <andersca@apple.com>
+
+        The style checker shouldn't complain about returning or passing OwnPtr
+        https://bugs.webkit.org/show_bug.cgi?id=121163
+
+        Reviewed by Antti Koivisto.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_function_definition_and_pass_ptr):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (PassPtrTest.test_pass_ref_ptr_return_value):
+        (PassPtrTest.test_own_ptr_parameter_value):
+
 2013-09-11  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

@@ -1640 +1640 @@
        error: The function to call with any errors found.
     """
-    match_ref_or_own_ptr = '(?=\W|^)(Ref|Own)Ptr(?=\W)'
-    bad_type_usage = search(match_ref_or_own_ptr, type_text)
+    match_ref_ptr = '(?=\W|^)RefPtr(?=\W)'
+    bad_type_usage = search(match_ref_ptr, type_text)
     if not bad_type_usage or type_text.endswith('&') or type_text.endswith('*'):
         return

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -3446 +3446 @@
             '{\n'
             '}',
-            'The return type should use PassOwnPtr instead of OwnPtr.  [readability/pass_ptr] [5]')
+            '')
 
     def test_ref_ptr_parameter_value(self):
@@ -3480 +3480 @@
             '{\n'
             '}',
-            'The parameter type should use PassOwnPtr instead of OwnPtr.  [readability/pass_ptr] [5]')
+            '')
         self.assert_pass_ptr_check(
             'int myFunction(OwnPtr<Type1>& simple)\n'