Merge pull request #9483 from electron/os-process-id-tweaks
Minor updates to webContents.getOSProcessId()
This commit is contained in:
commit
22099747af
4 changed files with 7 additions and 11 deletions
|
@ -1008,7 +1008,7 @@ int WebContents::GetProcessID() const {
|
|||
return web_contents()->GetRenderProcessHost()->GetID();
|
||||
}
|
||||
|
||||
int WebContents::GetOSProcessID() const {
|
||||
base::ProcessId WebContents::GetOSProcessID() const {
|
||||
auto process_handle = web_contents()->GetRenderProcessHost()->GetHandle();
|
||||
return base::GetProcId(process_handle);
|
||||
}
|
||||
|
|
|
@ -83,7 +83,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
|
|||
|
||||
int64_t GetID() const;
|
||||
int GetProcessID() const;
|
||||
int GetOSProcessID() const;
|
||||
base::ProcessId GetOSProcessID() const;
|
||||
Type GetType() const;
|
||||
bool Equal(const WebContents* web_contents) const;
|
||||
void LoadURL(const GURL& url, const mate::Dictionary& options);
|
||||
|
|
|
@ -63,7 +63,7 @@ const constraints = {
|
|||
chromeMediaSource: 'desktop'
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
## Methods
|
||||
|
|
|
@ -326,14 +326,10 @@ describe('webContents module', function () {
|
|||
|
||||
describe('getOSProcessId()', function () {
|
||||
it('returns a valid procress id', function () {
|
||||
// load URL otherwise getOSProcessId() returns 0
|
||||
w.loadURL('file://' + path.join(__dirname, 'fixtures', 'pages', 'focus-web-contents.html'))
|
||||
assert.strictEqual(w.webContents.getOSProcessId(), 0)
|
||||
|
||||
const specWebContents = w.webContents
|
||||
let pid = null
|
||||
assert.doesNotThrow(function () {
|
||||
pid = specWebContents.getOSProcessId()
|
||||
})
|
||||
w.loadURL('about:blank')
|
||||
const pid = w.webContents.getOSProcessId()
|
||||
assert(typeof pid === 'number', 'is a number')
|
||||
assert(pid > 0, 'superior to 0')
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue