From 06bf72da67d3bc673fffc248af16773147ef5b1c Mon Sep 17 00:00:00 2001 From: Robo Date: Fri, 9 Mar 2018 23:07:26 +0530 Subject: [PATCH] remove process preference lock from AtomBrowserClient (#12194) --- atom/browser/atom_browser_client.cc | 6 ------ atom/browser/atom_browser_client.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 42892025b0..8b7915bae9 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -131,34 +131,28 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance( void AtomBrowserClient::AddProcessPreferences( int process_id, AtomBrowserClient::ProcessPreferences prefs) { - base::AutoLock auto_lock(process_preferences_lock_); process_preferences_[process_id] = prefs; } void AtomBrowserClient::RemoveProcessPreferences(int process_id) { - base::AutoLock auto_lock(process_preferences_lock_); process_preferences_.erase(process_id); } bool AtomBrowserClient::IsProcessObserved(int process_id) { - base::AutoLock auto_lock(process_preferences_lock_); return process_preferences_.find(process_id) != process_preferences_.end(); } bool AtomBrowserClient::IsRendererSandboxed(int process_id) { - base::AutoLock auto_lock(process_preferences_lock_); auto it = process_preferences_.find(process_id); return it != process_preferences_.end() && it->second.sandbox; } bool AtomBrowserClient::RendererUsesNativeWindowOpen(int process_id) { - base::AutoLock auto_lock(process_preferences_lock_); auto it = process_preferences_.find(process_id); return it != process_preferences_.end() && it->second.native_window_open; } bool AtomBrowserClient::RendererDisablesPopups(int process_id) { - base::AutoLock auto_lock(process_preferences_lock_); auto it = process_preferences_.find(process_id); return it != process_preferences_.end() && it->second.disable_popups; } diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 14633370ff..95afc70b58 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -140,8 +140,6 @@ class AtomBrowserClient : public brightray::BrowserClient, // list of site per affinity. weak_ptr to prevent instance locking std::map site_per_affinities; - base::Lock process_preferences_lock_; - std::unique_ptr resource_dispatcher_host_delegate_;