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: update to chromium 75.0.3740.3 #17507

Merged
merged 37 commits into from Apr 3, 2019

Conversation

Projects
None yet
6 participants
@nornagon
Copy link
Contributor

nornagon commented Mar 21, 2019

BREAKING CHANGE: Upgraded to Chromium 75.

Notes: Upgraded to Chromium 75.

FIXME:

  • IsNearDeath is removed from upstream --> 73d7119

Requires Review:

  • enable_file_url_support can no longer be enabled by embedders: b1da14c Dealt with 796426a
@deepak1556

This comment has been minimized.

Copy link
Member

deepak1556 commented Mar 22, 2019

the sdk change commit and fix: ScopedBlockingCall now takes a location for tracing information , should have already made it through #17345 , wonder why the github ui doesn't show conflicts 😕

@MarshallOfSound MarshallOfSound marked this pull request as ready for review Mar 22, 2019

@MarshallOfSound MarshallOfSound requested a review from electron/wg-upgrades as a code owner Mar 22, 2019

@MarshallOfSound MarshallOfSound force-pushed the chromium-upgrade/75 branch from b05bd93 to 276087d Mar 22, 2019

@deepak1556

This comment has been minimized.

Copy link
Member

deepak1556 commented Mar 22, 2019

Another important change that went in this release is that windows builds switched to chromiums libc++ https://bugs.chromium.org/p/chromium/issues/detail?id=801780 , https://docs.google.com/document/d/1VPxepzuyWbXFzv1VpkSKEn0wPvSUffpcaOLislhcwrA/edit#heading=h.4r33ra48xro (check the design document). I think we should investigate the impact of this change.

Unsurprisingly the build errors are related to this :)

/cc @zcbenz

@deepak1556

This comment has been minimized.

Copy link
Member

deepak1556 commented Mar 22, 2019

@jkleinsc can we enable windows debug builds for the upgrade branches ?

@zcbenz

This comment has been minimized.

Copy link
Member

zcbenz commented Mar 25, 2019

Another important change that went in this release is that windows builds switched to chromiums libc++

Native node modules may be affected, but I think we should be fine since the runtime library is linked dynamically in native modules.

@jkleinsc

This comment has been minimized.

Copy link
Contributor

jkleinsc commented Mar 25, 2019

@deepak, I kicked off Windows debug builds

@nornagon

This comment has been minimized.

Copy link
Contributor Author

nornagon commented Mar 25, 2019

Native node modules may be affected, but I think we should be fine since the runtime library is linked dynamically in native modules.

I don't think this is true any more. See e.g. #16228, #14617

The design doc says:

Embedders that want to keep using Visual Studio’s C++ library can set use_custom_libcxx = false. This configuration will become community-supported, meaning we’ll accept patches to keep it working but won’t have bots for it.

and:

libc++ is not ABI-compatible with msstl, so projects embedding Chromium (like CEF) and exposing a C++ standard library objects in their API would require either that their embedders use libc++, or they’d have to keep Chromium buildable with the MS STL.

I think we should probably go with use_custom_libcxx = false on Windows.

@MarshallOfSound

This comment has been minimized.

Copy link
Member

MarshallOfSound commented Mar 25, 2019

I think we should probably go with use_custom_libcxx = false on Windows.

I agree, I'm getting a Windows VM set up at the moment so I'll give this a spin shortly 👍

@KoenLav

This comment has been minimized.

Copy link
Contributor

KoenLav commented Mar 26, 2019

@nornagon @MarshallOfSound please forgive my ignorance, but why stick with the "non-standard"/community supported route?

@nornagon

This comment has been minimized.

Copy link
Contributor Author

nornagon commented Mar 26, 2019

@KoenLav because of node native modules.

node native modules don't expect to be built against libc++ on windows & such may not compile. Additionally, we'd have to ship libc++'s headers with the electron header bundle and upstream changes to node-gyp and cmake-js to link against libc++ instead of msstl.

it's a complicated situation with no great answers. sticking with msstl is the easiest option in the short term, but we may have to figure out something else in the long run.

@MarshallOfSound MarshallOfSound force-pushed the chromium-upgrade/75 branch from 905c4f9 to f20d4ee Mar 29, 2019

@MarshallOfSound MarshallOfSound force-pushed the chromium-upgrade/75 branch from 2a37635 to 63d6be0 Apr 2, 2019

@deepak1556
Copy link
Member

deepak1556 left a comment

LGTM, couple of questions.

@MarshallOfSound
Copy link
Member

MarshallOfSound left a comment

Blocking on #17507 (comment)

@MarshallOfSound
Copy link
Member

MarshallOfSound left a comment

All set 👍

@@ -738,7 +739,8 @@ void InspectableWebContentsImpl::DispatchProtocolMessage(
if (message.length() < kMaxMessageChunkSize) {
base::string16 javascript =
base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + message + ");");

This comment has been minimized.

Copy link
@nornagon

nornagon Apr 3, 2019

Author Contributor

lol really, we don't escape this string at all?

@@ -52,7 +52,7 @@ def main(argv):
if sys.platform == 'darwin':
execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
else:
with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED) as z:
with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, True) as z:

This comment has been minimized.

Copy link
@nornagon

nornagon Apr 3, 2019

Author Contributor
Suggested change
with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, True) as z:
with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
is_fuchsia || is_android || is_mac ||
- (is_win && is_clang && !use_libfuzzer) ||
+ # Do not use custom libcxx on windows
+ # (is_win && is_clang && !use_libfuzzer) ||

This comment has been minimized.

Copy link
@nornagon

nornagon Apr 3, 2019

Author Contributor

i'd recommend adding && !is_electron here rather than commenting out.

@nornagon
Copy link
Contributor Author

nornagon left a comment

lgtm! :shipit:

@MarshallOfSound MarshallOfSound merged commit 5d45b59 into master Apr 3, 2019

8 checks passed

Semantic Pull Request ready to be squashed
Details
appveyor: win-ia32-debug AppVeyor build succeeded
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-debug AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

release-clerk bot commented Apr 3, 2019

Release Notes Persisted

Upgraded to Chromium 75.

@MarshallOfSound MarshallOfSound deleted the chromium-upgrade/75 branch Apr 3, 2019

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.