Handle cycles when merging browser window options #8340

Merged
merged 5 commits into from Jan 9, 2017

Projects

None yet

1 participant

@kevinsawicki
Contributor
kevinsawicki commented Jan 4, 2017 edited

Setting options.parent in a new-window event listener can currently lead to stack overflow errors when merging the options since webContents has a reference to itself.

This pull request follows the pattern of #6442 for tracking visited objects and nulling out cycles instead of overflowing.

Closes #8202

kevinsawicki added some commits Jan 4, 2017
@kevinsawicki kevinsawicki Use closeWindow helper b942c54
@kevinsawicki kevinsawicki Add failing spec for cycle in options 12382f0
@kevinsawicki kevinsawicki Track visited parents and null out cycles 1944fdc
@kevinsawicki kevinsawicki Assert duplicate objects are supported fd23c7b
@kevinsawicki kevinsawicki Remove lint errors
1f07977
@kevinsawicki kevinsawicki merged commit 5239012 into master Jan 9, 2017

9 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
electron-linux-arm Build #5113318 succeeded in 66s
Details
electron-linux-ia32 Build #5113319 succeeded in 60s
Details
electron-linux-x64 Build #5113320 succeeded in 128s
Details
electron-mas-x64 Build #3114 succeeded in 8 min 39 sec
Details
electron-osx-x64 Build #3128 succeeded in 8 min 42 sec
Details
electron-win-ia32 Build #2162 succeeded in 13 min
Details
electron-win-x64 Build #2149 succeeded in 13 min
Details
@kevinsawicki kevinsawicki deleted the options-cycle branch Jan 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment