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
Merged

Conversation

nornagon
Copy link
Member

@nornagon 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

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 21, 2019
@deepak1556
Copy link
Member

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 March 22, 2019 07:01
@MarshallOfSound MarshallOfSound requested a review from a team as a code owner March 22, 2019 07:01
@deepak1556
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
Copy link
Member

deepak1556 commented Mar 22, 2019

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

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Mar 22, 2019
@zcbenz
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
Copy link
Contributor

@deepak, I kicked off Windows debug builds

@nornagon
Copy link
Member 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
Copy link
Member

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
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
Copy link
Member Author

@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 and others added 16 commits April 2, 2019 14:43
…tocol

NOLINT disables the linting error that we can't fix because its just
implementing a content API.

We also disable clang-format because it tries to format the // NOLINT
onto a new line which doesn't exactly work
Adds a patch that reverts https://chromium-review.googlesource.com/c/v8/v8/+/1526195
in order to let native modules build.  nan has a strong dependency on
the IsNearDeath method.  This needs to be solved upstream in nan or V8.
Copy link
Member

@deepak1556 deepak1556 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, couple of questions.

Copy link
Member

@MarshallOfSound MarshallOfSound left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking on #17507 (comment)

Copy link
Member

@MarshallOfSound MarshallOfSound left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All set 👍

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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) ||
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

@nornagon nornagon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! :shipit:

@MarshallOfSound MarshallOfSound merged commit 5d45b59 into master Apr 3, 2019
@release-clerk
Copy link

release-clerk bot commented Apr 3, 2019

Release Notes Persisted

Upgraded to Chromium 75.

@MarshallOfSound MarshallOfSound deleted the chromium-upgrade/75 branch April 3, 2019 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants