Changeset 220321 in webkit

Timestamp:

Aug 5, 2017 4:48:26 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

check-webkit-style: fix path-specific rules for WebKit2 rename
​https://bugs.webkit.org/show_bug.cgi?id=175182

Patch by Yoshiaki Jitsukawa <​Yoshiaki.Jitsukawa@sony.com> on 2017-08-05
Reviewed by David Kilzer.

• Scripts/webkitpy/style/checker.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-05  Yoshiaki Jitsukawa  <Yoshiaki.Jitsukawa@sony.com>
+
+        check-webkit-style: fix path-specific rules for WebKit2 rename
+        https://bugs.webkit.org/show_bug.cgi?id=175182
+
+        Reviewed by David Kilzer.
+
+        * Scripts/webkitpy/style/checker.py:
+
 2017-08-04  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/webkitpy/style/checker.py

@@ -151 +151 @@
     ([# The GTK+ and WPE APIs use upper case, underscore separated, words in
       # certain types of enums (e.g. signals, properties).
-      os.path.join('Source', 'WebKit2', 'Shared', 'API', 'glib'),
-      os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'glib'),
-      os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'gtk'),
-      os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'wpe'),
-      os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'glib'),
-      os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk'),
-      os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'wpe')],
+      os.path.join('Source', 'WebKit', 'Shared', 'API', 'glib'),
+      os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'glib'),
+      os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'gtk'),
+      os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'wpe'),
+      os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'glib'),
+      os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'gtk'),
+      os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'wpe')],
      ["-readability/enum_casing"]),
 
@@ -179 +179 @@
       "-whitespace/parens"]),
 
-    # WebKit2 rules:
-    # WebKit2 and certain directories have idiosyncracies.
+    # WebKit rules:
+    # WebKit and certain directories have idiosyncracies.
     ([# NPAPI has function names with underscores.
-      os.path.join('Source', 'WebKit2', 'WebProcess', 'Plugins', 'Netscape')],
+      os.path.join('Source', 'WebKit', 'WebProcess', 'Plugins', 'Netscape')],
      ["-readability/naming"]),
-    ([# The WebKit2 C API has names with underscores and whitespace-aligned
+    ([# The WebKit C API has names with underscores and whitespace-aligned
       # struct members. Also, we allow unnecessary parameter names in
-      # WebKit2 APIs because we're matching CF's header style.
+      # WebKit APIs because we're matching CF's header style.
       # Additionally, we use word which starts with non-capital letter 'k'
       # for types of enums.
-      os.path.join('Source', 'WebKit2', 'UIProcess', 'API', 'C'),
-      os.path.join('Source', 'WebKit2', 'Shared', 'API', 'c'),
-      os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'c')],
+      os.path.join('Source', 'WebKit', 'UIProcess', 'API', 'C'),
+      os.path.join('Source', 'WebKit', 'Shared', 'API', 'c'),
+      os.path.join('Source', 'WebKit', 'WebProcess', 'InjectedBundle', 'API', 'c')],
      ["-readability/enum_casing",
       "-readability/naming",
@@ -344 +344 @@
     os.path.join('Source', 'JavaScriptCore', 'icu'),
     os.path.join('Source', 'WebCore', 'icu'),
-    os.path.join('Source', 'WebKit', 'mac', 'icu'),
+    os.path.join('Source', 'WebKitLegacy', 'mac', 'icu'),
     os.path.join('Source', 'WTF', 'icu'),
     ]