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

Merge pull request #9483 from electron/os-process-id-tweaks

Browse source 
Minor updates to webContents.getOSProcessId()
This commit is contained in:
Kevin Sawicki 2017-05-15 14:00:59 -07:00 • committed by GitHub
commit 22099747af
4 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,7 +1008,7 @@ int WebContents::GetProcessID() const {
return web_contents()->GetRenderProcessHost()->GetID(); return web_contents()->GetRenderProcessHost()->GetID();
} }
int WebContents::GetOSProcessID() const { base::ProcessId WebContents::GetOSProcessID() const {
auto process_handle = web_contents()->GetRenderProcessHost()->GetHandle(); auto process_handle = web_contents()->GetRenderProcessHost()->GetHandle();
return base::GetProcId(process_handle); return base::GetProcId(process_handle);
} }

2
atom/browser/api/atom_api_web_contents.h
View file

@ -83,7 +83,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
int64_t GetID() const; int64_t GetID() const;
int GetProcessID() const; int GetProcessID() const;
int GetOSProcessID() const; base::ProcessId GetOSProcessID() const;
Type GetType() const; Type GetType() const;
bool Equal(const WebContents* web_contents) const; bool Equal(const WebContents* web_contents) const;
void LoadURL(const GURL& url, const mate::Dictionary& options); void LoadURL(const GURL& url, const mate::Dictionary& options);

4
docs/api/desktop-capturer.md
View file

@ -63,7 +63,7 @@ const constraints = {
chromeMediaSource: 'desktop' chromeMediaSource: 'desktop'
} }
} }
}; }
``` ```
## Methods ## Methods
@ -75,7 +75,7 @@ The `desktopCapturer` module has the following methods:
* `options` Object * `options` Object
* `types` String[] - An array of Strings that lists the types of desktop sources * `types` String[] - An array of Strings that lists the types of desktop sources
to be captured, available types are `screen` and `window`. to be captured, available types are `screen` and `window`.
* `thumbnailSize` [Size](structures/size.md) (optional) - The size that the media source thumbnail * `thumbnailSize` [Size](structures/size.md) (optional) - The size that the media source thumbnail
should be scaled to. Default is `150` x `150`. should be scaled to. Default is `150` x `150`.
* `callback` Function * `callback` Function
* `error` Error * `error` Error

10
spec/api-web-contents-spec.js
View file

@ -326,14 +326,10 @@ describe('webContents module', function () {
describe('getOSProcessId()', function () { describe('getOSProcessId()', function () {
it('returns a valid procress id', function () { it('returns a valid procress id', function () {
// load URL otherwise getOSProcessId() returns 0 assert.strictEqual(w.webContents.getOSProcessId(), 0)
w.loadURL('file://' + path.join(__dirname, 'fixtures', 'pages', 'focus-web-contents.html'))
const specWebContents = w.webContents w.loadURL('about:blank')
let pid = null const pid = w.webContents.getOSProcessId()
assert.doesNotThrow(function () {
pid = specWebContents.getOSProcessId()
})
assert(typeof pid === 'number', 'is a number') assert(typeof pid === 'number', 'is a number')
assert(pid > 0, 'superior to 0') assert(pid > 0, 'superior to 0')
}) })