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

Side by Side Diff: trunk/src/tools/gn/setup.h

Issue 46313006: Revert 232657 "GN: toolchain threading cleanup" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/tools/gn/settings.cc ('k') | trunk/src/tools/gn/setup.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef TOOLS_GN_SETUP_H_ 5 #ifndef TOOLS_GN_SETUP_H_
6 #define TOOLS_GN_SETUP_H_ 6 #define TOOLS_GN_SETUP_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Run config file. 84 // Run config file.
85 bool RunConfigFile(); 85 bool RunConfigFile();
86 86
87 bool FillOtherConfig(const CommandLine& cmdline); 87 bool FillOtherConfig(const CommandLine& cmdline);
88 88
89 Scheduler scheduler_; 89 Scheduler scheduler_;
90 90
91 // These empty settings and toolchain are used to interpret the command line 91 // These empty settings and toolchain are used to interpret the command line
92 // and dot file. 92 // and dot file.
93 BuildSettings empty_build_settings_; 93 BuildSettings empty_build_settings_;
94 Toolchain empty_toolchain_;
94 Settings empty_settings_; 95 Settings empty_settings_;
95 Scope dotfile_scope_; 96 Scope dotfile_scope_;
96 97
97 // State for invoking the dotfile. 98 // State for invoking the dotfile.
98 base::FilePath dotfile_name_; 99 base::FilePath dotfile_name_;
99 scoped_ptr<InputFile> dotfile_input_file_; 100 scoped_ptr<InputFile> dotfile_input_file_;
100 std::vector<Token> dotfile_tokens_; 101 std::vector<Token> dotfile_tokens_;
101 scoped_ptr<ParseNode> dotfile_root_; 102 scoped_ptr<ParseNode> dotfile_root_;
102 103
103 // State for invoking the command line args. We specifically want to keep 104 // State for invoking the command line args. We specifically want to keep
(...skipping 23 matching lines...) Expand all
127 // These are the two parts of Run() in the regular setup, not including the 128 // These are the two parts of Run() in the regular setup, not including the
128 // call to actually run the message loop. 129 // call to actually run the message loop.
129 void RunPreMessageLoop(); 130 void RunPreMessageLoop();
130 bool RunPostMessageLoop(); 131 bool RunPostMessageLoop();
131 132
132 private: 133 private:
133 DISALLOW_COPY_AND_ASSIGN(DependentSetup); 134 DISALLOW_COPY_AND_ASSIGN(DependentSetup);
134 }; 135 };
135 136
136 #endif // TOOLS_GN_SETUP_H_ 137 #endif // TOOLS_GN_SETUP_H_
OLDNEW
« no previous file with comments | « trunk/src/tools/gn/settings.cc ('k') | trunk/src/tools/gn/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698