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

remove process preference lock from AtomBrowserClient (#12194)

Browse source
This commit is contained in:
Robo 2018-03-09 23:07:26 +05:30 committed by Shelley Vohr
parent f685e389d3
commit 06bf72da67
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/atom_browser_client.cc
View file

@ -131,34 +131,28 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
void AtomBrowserClient::AddProcessPreferences( void AtomBrowserClient::AddProcessPreferences(
int process_id, AtomBrowserClient::ProcessPreferences prefs) { int process_id, AtomBrowserClient::ProcessPreferences prefs) {
base::AutoLock auto_lock(process_preferences_lock_);
process_preferences_[process_id] = prefs; process_preferences_[process_id] = prefs;
} }
void AtomBrowserClient::RemoveProcessPreferences(int process_id) { void AtomBrowserClient::RemoveProcessPreferences(int process_id) {
base::AutoLock auto_lock(process_preferences_lock_);
process_preferences_.erase(process_id); process_preferences_.erase(process_id);
} }
bool AtomBrowserClient::IsProcessObserved(int process_id) { bool AtomBrowserClient::IsProcessObserved(int process_id) {
base::AutoLock auto_lock(process_preferences_lock_);
return process_preferences_.find(process_id) != process_preferences_.end(); return process_preferences_.find(process_id) != process_preferences_.end();
} }
bool AtomBrowserClient::IsRendererSandboxed(int process_id) { bool AtomBrowserClient::IsRendererSandboxed(int process_id) {
base::AutoLock auto_lock(process_preferences_lock_);
auto it = process_preferences_.find(process_id); auto it = process_preferences_.find(process_id);
return it != process_preferences_.end() && it->second.sandbox; return it != process_preferences_.end() && it->second.sandbox;
} }
bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) { bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) {
base::AutoLock auto_lock(process_preferences_lock_);
auto it = process_preferences_.find(process_id); auto it = process_preferences_.find(process_id);
return it != process_preferences_.end() && it->second.native_window_open; return it != process_preferences_.end() && it->second.native_window_open;
} }
bool AtomBrowserClient::RendererDisablesPopups(int process_id) { bool AtomBrowserClient::RendererDisablesPopups(int process_id) {
base::AutoLock auto_lock(process_preferences_lock_);
auto it = process_preferences_.find(process_id); auto it = process_preferences_.find(process_id);
return it != process_preferences_.end() && it->second.disable_popups; return it != process_preferences_.end() && it->second.disable_popups;
} }

2
atom/browser/atom_browser_client.h
View file

@ -140,8 +140,6 @@ class AtomBrowserClient : public brightray::BrowserClient,
// list of site per affinity. weak_ptr to prevent instance locking // list of site per affinity. weak_ptr to prevent instance locking
std::map<std::string, content::SiteInstance*> site_per_affinities; std::map<std::string, content::SiteInstance*> site_per_affinities;
base::Lock process_preferences_lock_;
std::unique_ptr<AtomResourceDispatcherHostDelegate> std::unique_ptr<AtomResourceDispatcherHostDelegate>
resource_dispatcher_host_delegate_; resource_dispatcher_host_delegate_;