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.

Sign up for GitHub

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

Jump to bottom

Upgrade from Chromium 116 to Chromium 117 #19398

Merged
merged 158 commits into from
Sep 6, 2023
Merged

Upgrade from Chromium 116 to Chromium 117 #19398

merged 158 commits into from
Sep 6, 2023

Conversation

cdesouza-chromium
Copy link
Collaborator

Resolves brave/brave-browser#31768

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@cdesouza-chromium cdesouza-chromium changed the title Cr117 Upgrade from Chromium 115 to Chromium 116 Jul 23, 2023
@cdesouza-chromium cdesouza-chromium changed the title Upgrade from Chromium 115 to Chromium 116 Upgrade from Chromium 116 to Chromium 117 Jul 23, 2023
@cdesouza-chromium cdesouza-chromium force-pushed the cr117 branch 3 times, most recently from 77afc04 to c6e31fb Compare July 25, 2023 00:05
@cdesouza-chromium cdesouza-chromium force-pushed the cr117 branch 8 times, most recently from dc1275a to 1fef51f Compare August 2, 2023 08:47
@cdesouza-chromium cdesouza-chromium force-pushed the cr117 branch 8 times, most recently from 85f59ec to a87d299 Compare August 10, 2023 07:02
@cdesouza-chromium cdesouza-chromium force-pushed the cr117 branch 3 times, most recently from 1d6b7de to 2d15676 Compare August 11, 2023 07:58
@cdesouza-chromium cdesouza-chromium force-pushed the cr117 branch 2 times, most recently from e58b2aa to faccd97 Compare August 15, 2023 08:10
mkarolin and others added 9 commits September 6, 2023 12:38
@mkarolin @cdesouza-chromium
Applies Brave styling to Extensions page.
7175f8a 
Chromium change:

https://chromium.googlesource.com/chromium/src/+/157b85d499303

commit 157b85d499303debd77b9465969bdb89baf07532
Author: Kelvin Jiang <[email protected]>
Date:   Thu Jun 29 03:19:44 2023 +0000

    [Extensions UI] Update sidebar styling to cr-nav-menu-item style

    Screenshot: https://imgur.com/a/R7v9Ivf
    Bug: 1455271
@mkarolin @cdesouza-chromium
Fixes gap between tabs and toolbar.
d1791d4 
We can't override GetLayoutConstant with ChromiumImpl because it calls
itself internally. Have to switch to a patch.
@emerick @cdesouza-chromium
showHttpsOnlyModeSetting_ went away as that mode is now the default
fae17a7 
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/9217d7660a576f1488ef59b96fa36290a51485a0

commit 9217d7660a576f1488ef59b96fa36290a51485a0
Author: Chris Thompson <[email protected]>
Date:   Tue Aug 1 11:13:25 2023 +0000

    Remove kHttpsOnlyMode feature flag

    This has been enabled-by-default since crrev.com/c/3082455. This CL
    removes the feature flag and updates the various places it was used.

    A followup CL will remove the HttpsFirstModeV2 feature flag and the old
    implementation of HTTPS-First Mode (i.e., HttpsOnlyModeUpgradeInterceptor,
    https_only_mode_browsertest.cc, etc.).

    Bug: 1468581
@mkarolin @cdesouza-chromium
Removes unnecessary polymer_overriding.js include.
2828937
@mkarolin @cdesouza-chromium
TabSearchButton::GetCornerRadius is now const.
904ded6 
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/cd64509b4ea09881057a11d5355b87b1084e302b

commit cd64509b4ea09881057a11d5355b87b1084e302b
Author: Taylor Bergquist <[email protected]>
Date:   Wed Aug 23 18:33:33 2023 +0000

    [ChromeRefresh2023] NTB and Tab Search buttons Fitt's law support.

    NTB/TSB now handle clicks up to the top of the tab strip region (and therefore the top of the frame) in maximized windows. To do this, they now apply a custom hit test mask, and their bounds are extended vertically to cover the entire tab strip region, with insets to vertically center them.

    Some fixes were needed now that the buttons have nonzero insets:
    - They get a custom highlight path generator, so the inkdrops and focus rings consider insets and overridden corner radius.
    - Background painting respects insets.
    - Preferred size respects insets.

    Bug: 1471989
@mkarolin @cdesouza-chromium
webui::GetWebUiCssTextDefaultsMd() was removed.
fb3303c 
Note that this change is from Chromium 113.

Chromium change:

https://source.chromium.org/chromium/chromium/src/+/671a49d1eb729eb8ce7d7ce77cb2591ae32b2d86

commit 671a49d1eb729eb8ce7d7ce77cb2591ae32b2d86
Author: dpapad <[email protected]>
Date:   Thu Mar 2 20:24:25 2023 +0000

    Remove unused webui::GetWebUiCssTextDefaultsMd() helper.

    Bug: 1419512
@mkarolin @cdesouza-chromium
Fixes upstream SafetyHubHandlerTest.RevokeAllContentSettingTypes test.
c29aeaf
@goodov @cdesouza-chromium
Simplify PageGraph attach on frame creation patch.
9262ff4
@mkarolin @cdesouza-chromium
[macOS] Adjust notarization agruments.
f89bc75 
Chromium changes:

https://chromium.googlesource.com/chromium/src/+/c1cad88d77340

commit c1cad88d773409e719de66c515e07fdef9db93e0
Author: Robert Sesek <[email protected]>
Date:   Wed Jul 12 23:02:59 2023 +0000

    macOS Signing Scripts: Drop support for altool-based notarization

    This also rolls the internal repo to remove references to
    model.NotarizationTool:

    Roll src/chrome/installer/mac/internal/ babcdbc1d..d7fb448e1 (1 commit)

    https://chrome-internal.googlesource.com/chrome/installer/mac/internal.git/+log/babcdbc1d727..d7fb448e1fc8

    Bug: 1449970

https://chromium.googlesource.com/chromium/src/+/b971bed75e187

commit b971bed75e1871651506bc8ebd13cb2fdf7b4496
Author: Robert Sesek <[email protected]>
Date:   Thu Jul 13 22:37:16 2023 +0000

    macOS Signing Scripts: Remove explicit notarization auth arguments

    Invokers of the signing scripts should now pass authentication
    arguments like so:

       --notary-arg=--keychain-profile --notary-arg MyKeychainProfile

    The old arguments remain for temporary command-line backwards
    compatibility, but they do not have any effect.

    Bug: 1449970
Brandon-T and others added 2 commits September 6, 2023 09:25
@Brandon-T @mkarolin
Fix crash on iOS due to navigation proxy returning nullptr.
387e9af 
Fixes crash on iOS in Cr117 by overriding the NavigationProxy to
use our own proxy instead of the Chromium one, when a webView is
not available (such is the case when syncing history or fetching
favicons).
@mkarolin
Fixes gn_check error.
c0c0dd1
@mkarolin
Updated BraveAppMenuModelBrowserTest.MenuItemsHaveIcons test.
6383fbb 
We do not currently have an icon for the Password Manager menu item.
Disable that command ID in the test.
@mkarolin mkarolin merged commit 04ef97c into master Sep 6, 2023
@mkarolin mkarolin deleted the cr117 branch September 6, 2023 18:21
@mkarolin mkarolin added this to the 1.59.x - Nightly milestone Sep 6, 2023
@github-actions github-actions bot added CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Sep 6, 2023
@mkarolin
Copy link
Collaborator

mkarolin commented Sep 6, 2023 •
edited by AlexeyBarabash
Loading

When uplifting, also uplift:

mkarolin added a commit that referenced this pull request Sep 6, 2023
@mkarolin
Merge pull request #19398 from brave/cr117
35e09f2 
Upgrade from Chromium 116 to Chromium 117
@mkarolin mkarolin mentioned this pull request Sep 6, 2023
Merged
25 tasks
mkarolin added a commit that referenced this pull request Sep 7, 2023
@mkarolin
Merge pull request #19398 from brave/cr117
130780c 
Upgrade from Chromium 116 to Chromium 117
kjozwiak pushed a commit that referenced this pull request Sep 11, 2023
@mkarolin @kylehickinson
@rillian @brave-builds
Upgrade from Chromium 116 to Chromium 117 (uplift to 1.58.x). (#20025)
2a92663 
* Merge pull request #19398 from brave/cr117

Upgrade from Chromium 116 to Chromium 117

* Explicitly adding rust sources to BUILD.gn files.

This was done in the original cr117 PR, but this change is specific to
1.58.x branch rust sources.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/eed02145256f53a0e85ffbb5bac4d567b625862a

commit eed02145256f53a0e85ffbb5bac4d567b625862a
Author: danakj <[email protected]>
Date:   Wed Jul 19 14:59:28 2023 +0000

    List all inputs to rust targets in GN and verify them during build

    RBE requires all inputs to be named in order for it to copy them to
    the remote build environment.

    GN analyze requires all inputs to be named in order to decide what
    needs to be rebuilt based on a list of modified files. The current GN
    analyze setup was supposed to do this as well, but it is not working.

    Have gnrt produce a list of all (possible) input files for 3p and
    stdlib crates so that it can be included in the generated BUILD.gn
    files.

    Then verify in rustc_wrapper.py that all inputs rustc reports are
    found in the GN rule's sources or inputs fields by comparing with the
    depfile produced from rustc.

    Bug: 1459444

* Merge pull request #20022 from brave/ios-cr117-build-fix

[iOS] Remove breaking `enable_arc` build configs

* Merge pull request #20029 from brave/cargo-audit-0.18.1

Update cargo-audit to v0.18.1

* IWYU fix.

* Upgrade from Chromium 117.0.5938.35 to Chromium 117.0.5938.48. (#20030)

* Upgrade from Chromium 117.0.5938.35 to Chromium 117.0.5938.48

* Upgrade patches from Chromium 117.0.5938.35 to Chromium 117.0.5938.48

* Update pins list timestamp

* Updated strings for Chromium 117.0.5938.48

---------

Co-authored-by: brave-builds <[email protected]>

* Merge pull request #20047 from brave/bugfix/ChromiumSessionRestore-iOS

[iOS] - Fix #32840: Disable Chromium Session-Restore for WebState and WebViews

---------

Co-authored-by: Kyle Hickinson <[email protected]>
Co-authored-by: Ralph Giles <[email protected]>
Co-authored-by: brave-builds <[email protected]>
@emerick emerick mentioned this pull request Apr 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samartnik samartnik samartnik left review comments

@mkarolin mkarolin mkarolin left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

@rillian rillian rillian left review comments

@darkdh darkdh darkdh approved these changes

@simonhong simonhong simonhong approved these changes

@bridiver bridiver bridiver approved these changes

@kylehickinson kylehickinson kylehickinson approved these changes

@tmancey tmancey tmancey approved these changes

@emerick emerick emerick approved these changes

@fmarier fmarier fmarier approved these changes

@AlexeyBarabash AlexeyBarabash AlexeyBarabash approved these changes

@zenparsing zenparsing zenparsing approved these changes

@bsclifton bsclifton bsclifton approved these changes

@iefremov iefremov iefremov approved these changes

@goodov goodov goodov approved these changes

Assignees

@fmarier fmarier

@thypon thypon

@samartnik samartnik

@cdesouza-chromium cdesouza-chromium

@mkarolin mkarolin

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet needs-security-review potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.59.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 116 to Chromium 117.