Update from https://crrev.com/306655
Includes updates to ui/ and mojo/services for cc and gpu changes and
a minor update to a unit test in sky/ for skia interface changes.
Review URL: https://codereview.chromium.org/761903003
diff --git a/tools/clang/scripts/run_tool.py b/tools/clang/scripts/run_tool.py
index 3725ca3..58a9a86 100755
--- a/tools/clang/scripts/run_tool.py
+++ b/tools/clang/scripts/run_tool.py
@@ -314,14 +314,14 @@
clang_format_diff_path = None
if len(argv) == 3 and argv[2] == '--all':
- filenames = frozenset(_GetFilesFromCompileDB(argv[1]))
+ filenames = set(_GetFilesFromCompileDB(argv[1]))
else:
- filenames = frozenset(_GetFilesFromGit(argv[2:]))
- # Filter out files that aren't C/C++/Obj-C/Obj-C++.
- extensions = frozenset(('.c', '.cc', '.m', '.mm'))
- dispatcher = _CompilerDispatcher(argv[0], argv[1],
- [f for f in filenames
- if os.path.splitext(f)[1] in extensions])
+ filenames = set(_GetFilesFromGit(argv[2:]))
+ # Filter out files that aren't C/C++/Obj-C/Obj-C++.
+ extensions = frozenset(('.c', '.cc', '.m', '.mm'))
+ filenames = [f for f in filenames
+ if os.path.splitext(f)[1] in extensions]
+ dispatcher = _CompilerDispatcher(argv[0], argv[1], filenames)
dispatcher.Run()
# Filter out edits to files that aren't in the git repository, since it's not
# useful to modify files that aren't under source control--typically, these
