Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use context counter as contextId (backport 2-0-x) #13735

Merged
merged 2 commits into from Jul 20, 2018

Conversation

Projects
None yet
3 participants
@nornagon
Copy link
Contributor

nornagon commented Jul 19, 2018

backport #13727 to 2-0-x

fix: use context counter as contextId (backport 2-0-x)
For sandboxed renderer it may not have a node::Environment in the context,
using a increasing counter as contextId works for all cases.

@nornagon nornagon requested a review from as a code owner Jul 19, 2018

fix: use webContentsId with contextId together
After after using `processId-contextCounter` as contextId, it may happen
that contexts in different WebContents sharing the same renderer process
get the same contextId. Using webContentsId as part of key in
ObjectsRegistry can fix this.
@zcbenz

zcbenz approved these changes Jul 20, 2018

@jkleinsc jkleinsc merged commit 58295a3 into 2-0-x Jul 20, 2018

12 of 14 checks passed

appveyor: electron-ia32-branch AppVeyor build failed
Details
appveyor: electron-x64-branch AppVeyor build failed
Details
Semantic Pull Request good to go
Details
WIP ready for review
Details
appveyor: electron-ia32-pr AppVeyor build succeeded
Details
appveyor: electron-x64-pr AppVeyor build succeeded
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-mas-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details

@jkleinsc jkleinsc deleted the backport-13727-2-0-x branch Jul 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.