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

Upgrade from Chromium 123 to Chromium 124. #22320

Merged
merged 130 commits into from
Apr 9, 2024
Merged

Upgrade from Chromium 123 to Chromium 124. #22320

merged 130 commits into from
Apr 9, 2024

Conversation

mkarolin
Copy link
Collaborator

Resolves brave/brave-browser#36346

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 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:

@mkarolin mkarolin added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) labels Feb 26, 2024
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet feature/web3/wallet/core labels Feb 26, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

mkarolin and others added 18 commits April 8, 2024 23:09
The tests fail on Windows and Linux because of misalignment.

This change gets the alignment fixed, but the ads team will follow up to
investigate the cause later, if necessary.
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/659fd1a6f93bf13263138af8ea1263e53dbc76b5

commit 659fd1a6f93bf13263138af8ea1263e53dbc76b5
Author: Hubert Chao <[email protected]>
Date:   Fri Feb 23 15:53:58 2024 +0000

    Android CCV/CRS cleanup: remove feature flag allowing toggle of CCV/CRS.

    Bug: 1493152
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/3e72b7c50426b1311b6ccf22c31821ac982fc0a6

commit 3e72b7c50426b1311b6ccf22c31821ac982fc0a6
Author: dpapad <[email protected]>
Date:   Thu Feb 29 21:23:19 2024 +0000

    WebUI: Migrate cr-tabs to LitElement.

    Bug: 40943652
Chromium change:

https://source.chromium.org/chromium/chromium/src/+/4384ef7d38df3d8e68691fe435c20544a0d7b744

commit 4384ef7d38df3d8e68691fe435c20544a0d7b744
Author: Andrew Rayskiy <[email protected]>
Date:   Wed Feb 28 20:41:58 2024 +0000

    [base] Update Erase()/EraseIf() calls for std::vector<> in components/

    They're now replaced with C++20 std::erase()/std::erase_if().

    Script:
    ```
    * extract files referencing Erase()/EraseIf() on cs via css selectors *

    1. Run sed replacements:
    's/base::EraseIf/std::erase_if/g'
    's/base::Erase/std::erase/g'
    's/#include "b/c/cxx20_erase.h"/#include <vector>/g'
    's/#include "b/c/cxx20_erase_vector.h"/#include <vector>/g'

    2. Run git cl format to sieve <vector> include upwards
    3. Run sed with -z to separate <vector> include from quoted includes
    (above and below)

    's/\n\n#include <vector>\n/\n#include <vector>\n\n/g'
    's/"\n#include <vector>/"\n\n#include <vector>/g'

    4. Run sed with -z to force <vector> includes on the remaining files:

    's/#include <(\w+)>/#include <\1>\n#include <vector>/g'

    5. Run git cl format to collapse duplicate <vector> includes

    6. Fix outliers by hand :)
    ```

    Bug: 40256229
This reverts commit 43347b5c480b98ef88e5fc8c0984b4f0c70e5b25.
https://source.chromium.org/chromium/chromium/src/+/00436d28afe641a5ef65add4939db43074969dab

commit 00436d28afe641a5ef65add4939db43074969dab
Author: Daniel Cheng <[email protected]>
Date:   Mon Mar 18 17:31:19 2024 +0000

    Mark base::MakeFixedFlatSet as consteval.

    FixedFlatSet is intended as a compile-time construct only, so restrict
    it as such. Also add nocompile tests to replace the lost coverage from
    the unit test.

    Bug: 41486252
Chromium change:
https://chromium.googlesource.com/chromium/src/+/9f3ebdf359c2bb1b3b6a098bc969b8da91cdaab4

commit 9f3ebdf359c2bb1b3b6a098bc969b8da91cdaab4
Author: Abigail Klein <[email protected]>
Date:   Wed Feb 28 21:31:34 2024 +0000

    Remove reader mode icon.

    This is part of a larger effort to remove the desktop kReaderMode flag
    from the codebase.

    Bug: 40258128
These functions are getting deleted by upstream and getting replaced by
safer version from `//base/numerics`. This change corrects all
occurrences of these functions.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/437342e0e2e8759f07c7de53e7512d202d761a83

commit 437342e0e2e8759f07c7de53e7512d202d761a83
Author: danakj <[email protected]>
Date:   Tue Mar 12 14:35:27 2024 +0000

    Remove base::{Read,Write}BigEndian

    These are now dead code, and replaced by base::numerics byte
    conversions.

    [email protected]

    Bug: 40284755
Upstream has provided a `LayoutImpl` alternative for such event.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/49b9e53e94a4a464a4b1ec12b449fb4be602edf3

commit 49b9e53e94a4a464a4b1ec12b449fb4be602edf3
Author: Dana Fried <[email protected]>
Date:   Wed Nov 6 19:03:43 2019 +0000

    Prevent layout manager from being invalidated during layout.

    Fixes potential hard crash when arbitrary View subclass calls
    InvalidateLayout() during OnBoundsChanged(), etc.

    (We saw this in at least one example in the wild.)

    Change-Id: I639fcaf0198fa899989b36a6264d1caa74ef8404
Chromium changes:
https://source.chromium.org/chromium/chromium/src/+/bfcf11b488c2d0156367fadbe184c18496bc69f1

M124: Read Aloud: fix browser controls position issues after theme change

If the theme is changed during playback, the player UI is recreated
while the main activity isn't visible the settings activity is on
screen instead.
 * The top toolbar control container height is 0, so when called back
   with browser controls offset changes, getToolbarExtraYOffset()
   gives the wrong result, placing the toolbar too low.
 * The bottom controls need to be translated to match the bottom
   controls min height whenever the real view becomes visible, not
   just at the end of min height animations.
 * Plumb the Read Aloud mini player show status over to
   BottomControlsMediator to help with positioning the bottom controls
   after restore when the usual height change animation callback won't
   be called.

(cherry picked from commit dc98643c9f66679b69636a5138e345338de3b758)

Bug: 329823963
This enum can be extended with a mojom extension, rather than relying on
some patch. This change adds the override for it.

Additionally, the module error message has been updated to indicate that
override scope mismatches might involve more than the namespace name.
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@mkarolin mkarolin merged commit 9c8e157 into master Apr 9, 2024
19 checks passed
@mkarolin mkarolin deleted the cr124 branch April 9, 2024 04:54
@github-actions github-actions bot added this to the 1.66.x - Nightly milestone Apr 9, 2024
mkarolin added a commit that referenced this pull request Apr 9, 2024
Upgrade from Chromium 123 to Chromium 124.
mkarolin added a commit that referenced this pull request Apr 10, 2024
Upgrade from Chromium 123 to Chromium 124.
mkarolin added a commit that referenced this pull request Apr 11, 2024
Upgrade from Chromium 123 to Chromium 124.
kjozwiak pushed a commit that referenced this pull request Apr 11, 2024
* Merge pull request #22320 from brave/cr124

Upgrade from Chromium 123 to Chromium 124.

* IWYU.

* Formatting fixes.

* [Android] Remove deprecated getLastUsedRegularProfile from Profile

Chromium change:
https://source.chromium.org/chromium/chromium/src/+/913e0498eac18b4cd078eb402e04dbe985ac18e0

Remove deprecated getLastUsedRegularProfile from Profile.java

Bug: 40254448

* Fixes build error on Mac/iOS.

 ERROR at //brave/browser/mac/BUILD.gn:6:18: Assignment had no effect.
 check_includes = false
                  ^----
 You set the variable "check_includes" here and it was unused before it went
 out of scope.
 See //brave/browser/sources.gni:445:41: which caused the file to be included.
   brave_chrome_browser_public_deps += [ "//brave/browser/mac:keystone_glue" ]
                                         ^----------------------------------

* Merge pull request #22986 from brave/ios-disable-partition-alloc

[iOS] Fix crash on launch with cr124

* Merge pull request #22985 from brave/maxk-fix-resource-ids-spec

Fixes components_brave_strings.grd ids being out of sync.

* Return the ffmpeg patch to fix memory usage (#22981)

* Merge pull request #22994 from brave/maxk-fix-cr124-colors

[Cr124 follow up] Fixes combobox and toggle hover colors.

* Merge pull request #23005 from brave/maxk-move-tab-memory-usage-toggle-to-tabs-settings

Moves tabs memory usage toggle to Tabs section in Appearance.

* Merge pull request #22996 from brave/fix_side_panel_card_background

Fixed side panel color issues from CR 124

---------

Co-authored-by: Kyle Hickinson <[email protected]>
Co-authored-by: Mikhail <[email protected]>
Co-authored-by: Simon Hong <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/run-windows-arm64 Run CI builds for Windows arm64 CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet/core feature/web3/wallet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 123 to Chromium 124