github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove use of deprecated API base::GetProc() (#50675)

Browse Source 
* refactor: replace deprecated API base::GetProcId() in web_frame_main

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: replace deprecated API base::GetProcId() in web_contents

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: replace deprecated API base::GetProcId() in a11y ui

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* refactor: frame.osProcessId now returns 0 instead of -1 for invalid processes.

This is consistent with WebContents.getOSProcessId

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot]
2026-04-04 11:19:40 -05:00
committed by GitHub
parent ef8c983ccb
commit 1686aa37f2
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shell/browser/api/electron_api_web_contents.cc
View File

@@ -2450,12 +2450,9 @@ int32_t WebContents::GetProcessID() const {
}
base::ProcessId WebContents::GetOSProcessID() const {
base::ProcessHandle process_handle = web_contents()
->GetPrimaryMainFrame()
->GetProcess()
->GetProcess()
.Handle();
return base::GetProcId(process_handle);
const auto& process =
web_contents()->GetPrimaryMainFrame()->GetProcess()->GetProcess();
return process.IsValid() ? process.Pid() : base::kNullProcessId;
}
GURL WebContents::GetURL() const {

11
shell/browser/api/electron_api_web_frame_main.cc
View File

@@ -393,10 +393,13 @@ std::string WebFrameMain::FrameToken() const {
base::ProcessId WebFrameMain::OSProcessID() const {
if (!CheckRenderFrame())
return -1;
base::ProcessHandle process_handle =
render_frame_host()->GetProcess()->GetProcess().Handle();
return base::GetProcId(process_handle);
return base::kNullProcessId;
const auto& process = render_frame_host()->GetProcess()->GetProcess();
if (!process.IsValid())
return base::kNullProcessId;
return process.Pid();
}
int32_t WebFrameMain::ProcessID() const {

9
shell/browser/ui/webui/accessibility_ui.cc
View File

@@ -101,13 +101,13 @@ base::DictValue BuildTargetDescriptor(
int process_id,
int routing_id,
ui::AXMode accessibility_mode,
base::ProcessHandle handle = base::kNullProcessHandle) {
base::ProcessId pid = base::kNullProcessId) {
base::DictValue target_data;
target_data.Set(kProcessIdField, process_id);
target_data.Set(kRoutingIdField, routing_id);
target_data.Set(kUrlField, url.spec());
target_data.Set(kNameField, base::EscapeForHTML(name));
target_data.Set(kPidField, static_cast<int>(base::GetProcId(handle)));
target_data.Set(kPidField, static_cast<int>(pid));
target_data.Set(kFaviconUrlField, favicon_url.spec());
target_data.Set(kAccessibilityModeField,
static_cast<int>(accessibility_mode.flags()));
@@ -138,9 +138,12 @@ base::DictValue BuildTargetDescriptor(content::RenderViewHost* rvh) {
accessibility_mode = web_contents->GetAccessibilityMode();
}
const auto& process = rvh->GetProcess()->GetProcess();
const auto pid = process.IsValid() ? process.Pid() : base::kNullProcessId;
return BuildTargetDescriptor(url, title, favicon_url,
rvh->GetProcess()->GetDeprecatedID(),
rvh->GetRoutingID(), accessibility_mode);
rvh->GetRoutingID(), accessibility_mode, pid);
}
base::DictValue BuildTargetDescriptor(electron::NativeWindow* window) {