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

chore: bump chromium to 2a7aff41ce73adc0eeee67d364989 (master) #18505

Merged
merged 21 commits into from Jun 4, 2019

Conversation

Projects
None yet
5 participants
@electron-bot
Copy link
Collaborator

commented May 29, 2019

Updating Chromium to 2a7aff41ce73adc0eeee67d364989 (lkgr).

See all changes in 964c4bca8de5c320534d95606c861..2a7aff41ce73adc0eeee67d364989

Notes: no-notes

@deepak1556 deepak1556 self-assigned this May 29, 2019

@deepak1556 deepak1556 added the wip label May 29, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from ea647fe to 5943c50 May 29, 2019

@electron-bot electron-bot requested a review from electron/wg-upgrades as a code owner May 29, 2019

@electron-bot electron-bot changed the title chore: bump chromium to 8b037c11f36022cb4c788db4628e3 (master) chore: bump chromium to 0990e141f47101b737ec1092175a1 (master) May 30, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from d158306 to f16b5f4 May 30, 2019

@deepak1556 deepak1556 removed the wip label May 31, 2019

@deepak1556 deepak1556 requested review from nornagon and zcbenz May 31, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from 9f566a5 to d0d769b May 31, 2019


// List of all request contexts that needs to be notified when
// IO thread is shutting down.
std::set<atom::URLRequestContextGetter*> request_context_getters_;

This comment has been minimized.

Copy link
@nornagon

nornagon May 31, 2019

Contributor

Hm... it seems like there might be a simpler way to handle the lifetimes of these objects. How does Chrome do it?

This comment has been minimized.

Copy link
@deepak1556

deepak1556 May 31, 2019

Member

We can't align with Chrome's behavior wrt these objects, because the URLRequestContextGetter is bound to BrowserContext , but we manage BrowserContext lifetime using the session module exposed to the users and these objects unless explicitly destroyed, they will get destroyed on app exit using the destructors registered in AtomBrowserMainParts::PostMainMessageLoopRun

Previously the NetworkService object didn't expect the primary network context to be destroyed, since there is only one per app lifetime. But now we need to make sure its destroyed because of https://chromium-review.googlesource.com/c/chromium/src/+/1632494, and destroying a primary network context requires all other network context objects destroyed before it. Although the IO thread cleanup happens after PostMainMessageLoopRun https://cs.chromium.org/chromium/src/content/browser/browser_main_loop.cc?l=1113 , sometimes the task we post to destroy URLRequestContext in atom::URLRequestContextGetter::Handle::ShutdownOnUIThread might not happen around the time IOThread::Cleanup is called, so the destruction order is messed up.

This change makes sure to track and delete those objects, its only a problem we face because we have exposed a dependency of these objects to user land. Also this is only a problem for pre network service code path, this will be going away soon. I think its fine to maintain it for the short time :)

@electron-bot electron-bot changed the title chore: bump chromium to 0990e141f47101b737ec1092175a1 (master) chore: bump chromium to 715df1d5426797998eed0932f7ae1 (master) May 31, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from a65f293 to e5e593c May 31, 2019

@zcbenz

zcbenz approved these changes Jun 1, 2019

@electron-bot electron-bot changed the title chore: bump chromium to 715df1d5426797998eed0932f7ae1 (master) chore: bump chromium to 7bdd05e248d0a3ef9dd9d3433e17b (master) Jun 1, 2019

@electron-bot electron-bot changed the title chore: bump chromium to 7bdd05e248d0a3ef9dd9d3433e17b (master) chore: bump chromium to ae9d70e535009d6afb066ac906063 (master) Jun 2, 2019

@electron-bot electron-bot changed the title chore: bump chromium to ae9d70e535009d6afb066ac906063 (master) chore: bump chromium to 2a7aff41ce73adc0eeee67d364989 (master) Jun 3, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch 2 times, most recently from 433155f to 3a41308 Jun 3, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from 3a41308 to 6a1f4c1 Jun 3, 2019

@deepak1556 deepak1556 force-pushed the roller/chromium/master branch from 6a1f4c1 to 6e01ca5 Jun 3, 2019

@MarshallOfSound MarshallOfSound merged commit d008d21 into master Jun 4, 2019

12 of 13 checks passed

Artifact Comparison Changes Detected
Details
Semantic Pull Request ready to be squashed
Details
WIP Ready for review
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-linux Workflow: build-linux
Details
build-mac Workflow: build-mac
Details
electron-arm-testing Build #20190604.9 succeeded
Details
electron-arm64-testing Build #20190604.9 succeeded
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

commented Jun 4, 2019

No Release Notes

@MarshallOfSound MarshallOfSound deleted the roller/chromium/master branch Jun 4, 2019

@deepak1556 deepak1556 referenced this pull request Jun 4, 2019

Merged

chore: Remove AtomResourceDispatcherHostDelegate #18623

2 of 6 tasks complete
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.