mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: Improve --enable-features/--disable-features handling (#13920)

Browse source 
As it turns out, we can reinitialize the feature list directly after the
user JS script has been executed instead of much later. This allows
modifications to `--enable-features`/`--disable-features` to work with a
greater set of features.
This commit is contained in:
Birunthan Mohanathas 2018-08-03 03:53:54 +03:00 • committed by Samuel Attard
parent 48ae9b7a9c
commit 23440a5ec3
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/atom_browser_main_parts.cc
View file

@ -154,6 +154,14 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
// Wrap the uv loop with global env. // Wrap the uv loop with global env.
node_bindings_->set_uv_env(env); node_bindings_->set_uv_env(env);
// We already initialized the feature list in
// brightray::BrowserMainParts::PreEarlyInitialization(), but
// the user JS script would not have had a chance to alter the command-line
// switches at that point. Lets reinitialize it here to pick up the
// command-line changes.
base::FeatureList::ClearInstanceForTesting();
brightray::BrowserMainParts::InitializeFeatureList();
} }
int AtomBrowserMainParts::PreCreateThreads() { int AtomBrowserMainParts::PreCreateThreads() {

10
brightray/browser/browser_main_parts.cc
View file

@ -268,16 +268,6 @@ void BrowserMainParts::PreMainMessageLoopStart() {
} }
void BrowserMainParts::PreMainMessageLoopRun() { void BrowserMainParts::PreMainMessageLoopRun() {
// We already initialized the feature list in PreEarlyInitialization(), but
// the user JS script would not have had a chance to alter the command-line
// switches at that point. Lets force re-initialization here to pick up the
// command-line changes. Note that some Chromium code (e.g.
// gpu_process_host.cc) queries the feature list between
// PreEarlyInitialization() and here so the user script may not have
// control over all features. Better than nothing though!
base::FeatureList::ClearInstanceForTesting();
InitializeFeatureList();
content::WebUIControllerFactory::RegisterFactory( content::WebUIControllerFactory::RegisterFactory(
WebUIControllerFactory::GetInstance()); WebUIControllerFactory::GetInstance());

4
brightray/browser/browser_main_parts.h
View file

@ -43,14 +43,14 @@ class BrowserMainParts : public content::BrowserMainParts {
int PreCreateThreads() override; int PreCreateThreads() override;
void PostDestroyThreads() override; void PostDestroyThreads() override;
void InitializeFeatureList();
private: private:
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
void InitializeMainNib(); void InitializeMainNib();
void OverrideAppLogsPath(); void OverrideAppLogsPath();
#endif #endif
void InitializeFeatureList();
std::unique_ptr<IOThread> io_thread_; std::unique_ptr<IOThread> io_thread_;
#if defined(USE_AURA) #if defined(USE_AURA)