Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Unified Diff: third_party/WebKit/Source/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java

Issue 2441163002: DevTools: clean up scripts folder (Closed)
Patch Set: Fix sys.path for chromevox to load rjsmin Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java
diff --git a/third_party/WebKit/Source/devtools/scripts/compiler-runner/src/org/chromium/devtools/compiler/Runner.java b/third_party/WebKit/Source/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java
similarity index 93%
rename from third_party/WebKit/Source/devtools/scripts/compiler-runner/src/org/chromium/devtools/compiler/Runner.java
rename to third_party/WebKit/Source/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java
index 6cf6f70992bdb0c9edcf160609b05dd9e334bfc7..f0b1296f7319ed7fdf2b276f533899c4c64e999c 100644
--- a/third_party/WebKit/Source/devtools/scripts/compiler-runner/src/org/chromium/devtools/compiler/Runner.java
+++ b/third_party/WebKit/Source/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java
@@ -109,9 +109,8 @@ public class Runner {
// because its constructor should be executed on a single thread.
// Constructor is parsing flags and creating options object that can
// be used later in parallel during compilation.
- LocalCommandLineRunner runner =
- new LocalCommandLineRunner(descriptor.commandLine.split(" +"),
- System.out, errPrintStream);
+ LocalCommandLineRunner runner = new LocalCommandLineRunner(
+ descriptor.commandLine.split(" +"), System.out, errPrintStream);
CompilerRunner task = new CompilerRunner(descriptor, rawStream, runner);
futures.add(executor.submit(task));
@@ -143,8 +142,7 @@ public class Runner {
private List<CompilerInstanceDescriptor> getDescriptors() {
List<CompilerInstanceDescriptor> result = new ArrayList<>();
try (BufferedReader reader = new BufferedReader(
- new InputStreamReader(
- new FileInputStream(flags.compilerArgsFile), "UTF-8"))) {
+ new InputStreamReader(new FileInputStream(flags.compilerArgsFile), "UTF-8"))) {
int lineIndex = 0;
while (true) {
++lineIndex;
@@ -158,8 +156,9 @@ public class Runner {
String[] moduleAndArgs = line.split(" +", 2);
if (moduleAndArgs.length != 2) {
logError(String.format(
- "Line %d does not contain module name and compiler arguments",
- lineIndex), null);
+ "Line %d does not contain module name and compiler arguments",
+ lineIndex),
+ null);
continue;
}
result.add(new CompilerInstanceDescriptor(moduleAndArgs[0], moduleAndArgs[1]));
@@ -182,7 +181,6 @@ public class Runner {
}
private static class LocalCommandLineRunner extends CommandLineRunner {
-
protected LocalCommandLineRunner(String[] args, PrintStream out, PrintStream err) {
super(args, out, err);
}
@@ -223,9 +221,8 @@ public class Runner {
private int result;
private final LocalCommandLineRunner runner;
- public CompilerRunner(
- CompilerInstanceDescriptor descriptor, ByteArrayOutputStream errStream,
- LocalCommandLineRunner runner) {
+ public CompilerRunner(CompilerInstanceDescriptor descriptor,
+ ByteArrayOutputStream errStream, LocalCommandLineRunner runner) {
this.descriptor = descriptor;
this.errStream = errStream;
this.runner = runner;

Powered by Google App Engine
This is Rietveld 408576698