Title: [220321] trunk/Tools
Revision
220321
Author
commit-qu...@webkit.org
Date
2017-08-05 16:48:26 -0700 (Sat, 05 Aug 2017)

Log 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.jitsuk...@sony.com> on 2017-08-05
Reviewed by David Kilzer.

* Scripts/webkitpy/style/checker.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (220320 => 220321)


--- trunk/Tools/ChangeLog	2017-08-05 22:11:28 UTC (rev 220320)
+++ trunk/Tools/ChangeLog	2017-08-05 23:48:26 UTC (rev 220321)
@@ -1,3 +1,12 @@
+2017-08-05  Yoshiaki Jitsukawa  <yoshiaki.jitsuk...@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  <you...@apple.com>
 
         [Cache API] Add Cache and CacheStorage IDL definitions

Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (220320 => 220321)


--- trunk/Tools/Scripts/webkitpy/style/checker.py	2017-08-05 22:11:28 UTC (rev 220320)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py	2017-08-05 23:48:26 UTC (rev 220321)
@@ -150,13 +150,13 @@
 
     ([# 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"]),
 
     ([# To use GStreamer GL without conflicts of GL symbols,
@@ -178,19 +178,19 @@
      ["-readability/parameter_name",
       "-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",
       "-readability/parameter_name",
@@ -343,7 +343,7 @@
     # ICU headers are imported.
     os.path.join('Source', '_javascript_Core', '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'),
     ]
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to