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

GetRenderProcessHost() has been removed for OOPI support, should use #include GetMainFrame()->GetProcess()

Browse source
This commit is contained in:
Samuel Attard 2017-12-18 13:46:23 +11:00 • committed by Aleksei Kuzmin
parent c3dec709ab
commit a8e013dcb6
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_web_contents.cc
View file

@ -1041,7 +1041,7 @@ void WebContents::NavigationEntryCommitted(
}
int64_t WebContents::GetIDForContents(content::WebContents* web_contents) {
int64_t process_id = web_contents->GetRenderProcessHost()->GetID();
int64_t process_id = web_contents->GetMainFrame()->GetProcess()->GetID();
int64_t routing_id = web_contents->GetMainFrame()->GetRoutingID();
int64_t rv = (process_id << 32) + routing_id;
return rv;
@ -1052,11 +1052,12 @@ int64_t WebContents::GetID() const {
}
int WebContents::GetProcessID() const {
return web_contents()->GetRenderProcessHost()->GetID();
return web_contents()->GetMainFrame()->GetProcess()->GetID();
}
base::ProcessId WebContents::GetOSProcessID() const {
auto process_handle = web_contents()->GetRenderProcessHost()->GetHandle();
auto process_handle =
web_contents()->GetMainFrame()->GetProcess()->GetHandle();
return base::GetProcId(process_handle);
}