From ffdf2f7fcf04b3e24216024794bdc155f6af1ef8 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Mon, 15 Dec 2014 11:22:14 -0800 Subject: [PATCH] Check key via ContainsKey instead of null check --- atom/browser/web_view/web_view_manager.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/atom/browser/web_view/web_view_manager.cc b/atom/browser/web_view/web_view_manager.cc index 23023e2b1d..c638c18e12 100644 --- a/atom/browser/web_view/web_view_manager.cc +++ b/atom/browser/web_view/web_view_manager.cc @@ -80,16 +80,18 @@ void WebViewManager::AddGuest(int guest_instance_id, } void WebViewManager::RemoveGuest(int guest_instance_id) { + if (!ContainsKey(web_contents_map_, guest_instance_id)) { + return; + } + auto web_contents = web_contents_map_[guest_instance_id].web_contents; - if (web_contents) { - content::BrowserThread::PostTask( - content::BrowserThread::IO, FROM_HERE, - base::Bind( - &WebViewRendererState::RemoveGuest, - base::Unretained(WebViewRendererState::GetInstance()), - web_contents->GetRenderProcessHost()->GetID())); - } + content::BrowserThread::PostTask( + content::BrowserThread::IO, FROM_HERE, + base::Bind( + &WebViewRendererState::RemoveGuest, + base::Unretained(WebViewRendererState::GetInstance()), + web_contents->GetRenderProcessHost()->GetID())); web_contents_map_.erase(guest_instance_id);