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

Don't rely on process_id to search for NativeWindow

Browse source
This commit is contained in:
Cheng Zhao 2015-06-03 14:08:56 +08:00
parent 6dfa7b5383
commit d4be2da70e
7 changed files with 36 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/web_view_manager.cc
View file

@ -12,10 +12,9 @@ namespace atom {
namespace {
WebViewManager* GetManagerFromProcess(content::RenderProcessHost* process) {
if (!process)
return nullptr;
auto context = process->GetBrowserContext();
WebViewManager* GetManagerFromWebContents(
const content::WebContents* web_contents) {
auto context = web_contents->GetBrowserContext();
if (!context)
return nullptr;
return static_cast<WebViewManager*>(context->GetGuestManager());
@ -24,24 +23,9 @@ WebViewManager* GetManagerFromProcess(content::RenderProcessHost* process) {
} // namespace
// static
bool WebViewManager::GetInfoForProcess(content::RenderProcessHost* process,
WebViewInfo* info) {
auto manager = GetManagerFromProcess(process);
if (!manager)
return false;
base::AutoLock auto_lock(manager->lock_);
for (auto iter : manager->webview_info_map_)
if (iter.first->GetRenderProcessHost() == process) {
*info = iter.second;
return true;
}
return false;
}
// static
bool WebViewManager::GetInfoForWebContents(content::WebContents* web_contents,
WebViewInfo* info) {
auto manager = GetManagerFromProcess(web_contents->GetRenderProcessHost());
bool WebViewManager::GetInfoForWebContents(
const content::WebContents* web_contents, WebViewInfo* info) {
auto manager = GetManagerFromWebContents(web_contents);
if (!manager)
return false;
base::AutoLock auto_lock(manager->lock_);