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 117.0.5852.0 (main) #38891

Merged
merged 40 commits into from
Jul 1, 2023
Merged

Conversation

electron-roller[bot]
Copy link
Contributor

@electron-roller electron-roller bot commented Jun 22, 2023

Updating Chromium to 117.0.5852.0.

See all changes in 116.0.5845.0..117.0.5852.0

Notes: Updated Chromium to 117.0.5852.0.

@electron-roller electron-roller bot requested a review from a team as a code owner June 22, 2023 08:52
@electron-roller electron-roller bot added no-backport semver/patch backwards-compatible bug fixes labels Jun 22, 2023
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jun 22, 2023
@patchup patchup bot requested a review from a team as a code owner June 22, 2023 09:08
@codebytere codebytere force-pushed the roller/chromium/main branch 2 times, most recently from b1d5e6a to 8a6577b Compare June 22, 2023 11:06
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 23, 2023
@electron-roller electron-roller bot changed the title chore: bump chromium to 117.0.5846.0 (main) chore: bump chromium to 117.0.5848.2 (main) Jun 23, 2023
@miniak
Copy link
Contributor

miniak commented Jun 23, 2023

there are some more places that should be cleaned up as macOS support is bumped to 10.15+

  1. documentation as suggested here 5478a07 + add to docs/breaking-changes.md

  2. bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
    if (base::mac::IsAtLeastOS10_14()) {
    if (Command::IsMediaKey(accelerator)) {
    if (!electron::api::SystemPreferences::IsTrustedAccessibilityClient(
    false))
    return true;
    }
    }
    return false;
    }

  3. ifdescribe(process.platform === 'darwin' && semver.gte(os.release(), '18.0.0'))('on macOS 10.14', () => {

  4. (SKPaymentDiscount*)paymentDiscount API_AVAILABLE(macosx(10.14.4)) {

  5. API_AVAILABLE(macosx(10.13.2)) {

  6. (SKProductDiscount*)productDiscount API_AVAILABLE(macosx(10.13.2)) {

  7. UNNotificationResponse* response) API_AVAILABLE(macosx(10.14)) {

  8. + if (@available(macOS 10.14, *)) {
    + // Disclaim TCC responsibilities
    + if (responsibility_spawnattrs_setdisclaim)
    + CHECK_ERR(responsibility_spawnattrs_setdisclaim(&attr, 1));
    + }

  9. -// The NSFont/CTFont toll-free bridging is broken before 10.15.
    -// https://openradar.appspot.com/15341349
    -//
    -// TODO(https://crbug.com/1076527): This is fixed in 10.15. When 10.15 is the
    -// minimum OS for Chromium, remove this SPI declaration.
    -Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);

@ckerr
Copy link
Member

ckerr commented Jun 23, 2023

  • documentation as suggested here 5478a07 + add to docs/breaking-changes.md

+1 on this suggestion but let's patch breaking-changes.md in a separate PR so that it can be tropped to 26-x-y

@ckerr
Copy link
Member

ckerr commented Jun 23, 2023

@miniak updated to address review feedback.

The breaking-changes update is up in a standalone PR at #38917 so that trop can backport it.

@electron-roller electron-roller bot changed the title chore: bump chromium to 117.0.5848.2 (main) chore: bump chromium to 117.0.5850.0 (main) Jun 24, 2023
@electron-roller electron-roller bot changed the title chore: bump chromium to 117.0.5850.0 (main) chore: bump chromium to 117.0.5852.0 (main) Jun 25, 2023
@miniak
Copy link
Contributor

miniak commented Jun 26, 2023

@ckerr

ifdescribe(process.platform === 'darwin' && semver.gte(os.release(), '18.0.0'))('on macOS 10.14', () => {
is still there

@deepak1556
Copy link
Member

@miniak addressed in f395765

@miniak
Copy link
Contributor

miniak commented Jun 26, 2023

@deepak1556 the macOS version check is not needed anymore

@miniak
Copy link
Contributor

miniak commented Jun 26, 2023

@deepak1556 or if you believe it's still needed, please use semver.gte(process.getSystemVersion(), '10.15.0')) instead

@deepak1556
Copy link
Member

yeah the version check is not needed, removed it in b9de43a

@deepak1556
Copy link
Member

Failing x64-testing test is flaky, failed on main as well https://ci.appveyor.com/project/electron-bot/electron-x64-testing/builds/47407765/job/vuwa47496ajr1vfu/tests

@zcbenz
Copy link
Member

zcbenz commented Jun 29, 2023

The fix for setAspectRatio seems to make a BrowserWindow.restore() test fail.

@jkleinsc jkleinsc merged commit ccd4531 into main Jul 1, 2023
14 checks passed
@jkleinsc jkleinsc deleted the roller/chromium/main branch July 1, 2023 20:22
@release-clerk
Copy link

release-clerk bot commented Jul 1, 2023

Release Notes Persisted

Updated Chromium to 117.0.5852.0.

@zcbenz
Copy link
Member

zcbenz commented Jul 2, 2023

@deepak1556 Have you tried to upstream fix_harden_blink_scriptstate_maybefrom.patch?

@deepak1556
Copy link
Member

@zcbenz I didn't get to it before heading into vacation. I will try upstreaming it this week.

MrHuangJser pushed a commit to MrHuangJser/electron that referenced this pull request Dec 11, 2023
* chore: bump chromium in DEPS to 117.0.5846.0

* chore: update patches

* 4628901: Bump the macOS deployment target to 10.15

https://chromium-review.googlesource.com/c/chromium/src/+/4628901

* 4593350: [Private Network Access] Trigger Permission Prompt

https://chromium-review.googlesource.com/c/chromium/src/+/4593350

* 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs

https://chromium-review.googlesource.com/c/chromium/src/+/4631011

* chore: disable API deprecation warnings in NSKeyedArchiver

* chore: update libcxx filenames

* chore: bump chromium in DEPS to 117.0.5848.2

* chore: update feat_add_set_theme_source_to_allow_apps_to.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743

No manual changes; patch succeeded with fuzz

* chore: update process_singleton.patch

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398

Trivial manual patch adjustments to account for code shear.

* chore: remove electron::BrowserContext::GetMediaDeviceIDSalt()

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130

upstream tldr:
- content::BrowserContext::GetMediaDeviceIDSalt()
- content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed()
+ content::ContentBrowserClient::GetMediaDeviceIDSalt()

This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in
place (now non-virtual, non-override). It is now called by the new
function ElectronBrowserClient::GetMediaDeviceIDSalt().

As a followup, we might want to consider using the new upstream
media_device_salt::MediaDeviceSaltService and removing our
electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd
opinion since he has done the most work on MediaDeviceIDSalt and
may have more context.

* chore: fix iwyu breakage

Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624

electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't
include it. Things worked anyway because we got it indirectly from
content/public/browser/web_contents.h until 4629624.

* chore: remove call to base::mac::IsAtLeastOS10_14

upstream has bumped minimum version to 10.15 so this call is moot?

* chore: remove obsolete API_AVAILABLE calls in IAP

upstream has bumped minimum version to 10.15 so this call is moot?

* chore: remove obsolete API_AVAILABLE calls in electron_application_delegate

upstream has bumped minimum version to 10.15 so this call is moot?

* chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch

Upstream has bumped minimum to macOS 10.15

* chore: remove @available(macOS 10.14) check

Upstream minimum requirement for macOS is now 10.15

* chore: update patches

* chore: bump chromium in DEPS to 117.0.5850.0

* chore: update patches

* chore: bump chromium in DEPS to 117.0.5852.0

* chore: update patches

* Move two params from NetworkContextParams to NetworkContextFilePaths.

https://chromium-review.googlesource.com/c/chromium/src/+/4615930

* WebUSB: Add exclusionFilters to USBRequestDeviceOptions

https://chromium-review.googlesource.com/c/chromium/src/+/4614682

* Convert /chrome/browser/ui to use ARC

https://chromium-review.googlesource.com/c/chromium/src/+/4615920

* fixup! Bump the macOS deployment target to 10.15

* fixup! Bump the macOS deployment target to 10.15

* chore: update libcxx files

* win: Remove 10Glass from Windows10Glass function and var names

https://chromium-review.googlesource.com/c/chromium/src/+/4641314

* chore: revert 392e5f43 from chromium

* Add an ExecutionContext to ScriptState

https://chromium-review.googlesource.com/c/chromium/src/+/4609446

* fixup! Add an ExecutionContext to ScriptState

* chore: fix header

* Revert "chore: revert 392e5f43 from chromium"

This reverts commit b7f7829.

* fix: return correct min/max sizes in WinFrameView

* fixup! Revert chore: revert 392e5f43 from chromium

* fixup! Add an ExecutionContext to ScriptState

* Revert "fixup! Revert chore: revert 392e5f43 from chromium"

This reverts commit 7e2c728.

* Revert "fix: return correct min/max sizes in WinFrameView"

This reverts commit 3f418b1.

* Revert "Revert "chore: revert 392e5f43 from chromium""

This reverts commit 56296d8.

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-backport roller/pause semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants