-
Notifications
You must be signed in to change notification settings - Fork 873
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 97 to Chromium 98 #11223
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mkarolin
added
CI/run-network-audit
Run network-audit
CI/run-audit-deps
Check for known npm/cargo vulnerabilities (audit_deps)
labels
Nov 22, 2021
mkarolin
requested review from
orspetol,
samartnik,
simonhong and
a team
as code owners
November 22, 2021 19:23
mariospr
force-pushed
the
cr98
branch
3 times, most recently
from
November 25, 2021 10:53
8a0f967
to
2623a52
Compare
mkarolin
force-pushed
the
cr98
branch
4 times, most recently
from
December 9, 2021 01:08
2afafd0
to
3d20e0b
Compare
Chromium change: https://chromium-review.googlesource.com/c/chromium/src/+/3237868 [GMNext] Make active and normal control colors dynamic This CL converts default_control_color_active and default_control_color_normal into macros to migrate them to dynamic colors and updates their usages. Bug: 1270919
This reverts commit 9e74f6a. Now that our rust code is no longer linked dynamically we should not crash on MacOS due to multiple loading of //base.
…mirror" Github mirror has been fixed, there is no need to switch to chromium mirror. This reverts commit 879e1e3.
Instead, apply upstream patch to remove the noise from the dsymutl output. See: https://chromium.googlesource.com/chromium/src/+/9dc9fa84434a1d13450a8612a199fa26ce0a364a%5E%21/#F0 This reverts commit c77e5eb.
This is an upstream patch https://chromium.googlesource.com/chromium/src/+/9dc9fa84434a1d13450a8612a199fa26ce0a364a This superceeds a prior temporary fix of setting use_ifc flag to false for non official builds. ---------- Building Release on MacOS produces a huge number of linker warnings of the sort: warning: (x86_64) could not find object file symbol for symbol ... This has been reported to Chromium in https://bugs.chromium.org/p/chromium/issues/detail?id=1284576 where it was determined that the culprit is the use_icf flag. The fix for this issue is tracked upstream in https://bugs.chromium.org/p/chromium/issues/detail?id=1279639
Otherwise it falls back to MaterialCheckBox and causes UI issues Fixes brave/brave-browser#20647
Chromium change: https://chromium.googlesource.com/chromium/src/+/2221bd8620779 commit 2221bd86207794327bd890681cb011f6e1b2a73e Author: Adrian Taylor <adetaylor@chromium.org> Date: Fri Dec 3 18:04:48 2021 +0000 [rust] Roll cxx to 1.0.57. This rolls cxx, cxxbridge_cmd and cxxbridge_macro Rust dependencies from 1.0.56 to 1.0.57. The only reason to do this is because they've taken one of our patches upstream, so we can delete one of our .patch files and slightly unfork. Procedure used: * Cherry-pick patchset 60 of https://chromium-review.googlesource.com/c/chromium/src/+/3212915 * Delete third_party/rust/cxx/v1/crate * Delete third_party/rust/cxxbridge_cmd/v1/crate * Delete third_party/rust/cxxbridge_macro/v1/crate * vpython3 tools/crates/crates.py download cxx 1.0 --security-critical no * vpython3 tools/crates/crates.py download cxxbridge-macro 1.0 --security-critical no * vpython3 tools/crates/crates.py download cxxbridge-cmd 1.0 --security-critical no * Reapply all patches from third_party/rust/{each of the three crates}/v1/patches * vpython3 tools/crates/crates.py gen (didn't make any changes) This CL also: * Deletes one of the patch files form third_party/rust/cxxbridge_cmd/v1/patches, because that patch has now been accepted upstream. * Renames one of the other patch files which was badly named.
Have personalization page items be anchored by metricsReportingControl instead of searchSuggestToggle. searchSuggestToggle is now hidden even upstream, although I have not been able to pinpoint why. It ends up with the display: none style in the template element that wraps it. This has been reported upstream via https://bugs.chromium.org/p/chromium/issues/detail?id=1288911 Possibly caused by https://source.chromium.org/chromium/chromium/src/+/01989f43dd8d2cf766b4c0a5128a7cc3c31e26c0 commit 01989f43dd8d2cf766b4c0a5128a7cc3c31e26c0 Author: Boris Sazonov <bsazonov@chromium.org> Date: Tue Nov 23 13:00:41 2021 +0000 Hide search suggest toggle in OS settings Hides "Autocomplete searches and URLs" toggle in OS settings on ChromeOS if SyncSettingsCategorization is enabled. This CL also replaces "hidden" attribute in that toggle with dom-if template to fix entry separator issues ("first-of-type" style doesn't seem to work correctly with "hidden" attribute). Screenshot: https://crbug.com/1267967#c13. Bug: 1267967
Chromium change: chromium/chromium@c71daa8 Reland "Component Updater: Refactor disable-updates policy." This is a reland of 4df6643 Patch set 1 is the original change, and patch set 4 is the fixed version. Original change's description: > Component Updater: Refactor disable-updates policy. > > The handling of the policy and combination with component data is moved > out of update_client (which is used by many embedders) and into > component_updater. > > To achieve this, component_updater's Register no longer takes a strict > subset of CrxComponent information as an argument. A new type > (ComponentRegistration) is introduced to hold a component's registration > information with the component updater, and it is used to construct > CrxComponents on the fly in the crx data callback. The policy is applied > at that time. > > There should be no change in behavior, but the simplication of > update_client's API makes the behavior of chrome/updater more clear. > > Bug: 1094024 > Change-Id: I0c1992acd3baf4ef30adb5ce5d191ff13df9c3f3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3291368 > Auto-Submit: Joshua Pawlicki <waffles@chromium.org> > Commit-Queue: Gabriel Charette <gab@chromium.org> > Reviewed-by: Gabriel Charette <gab@chromium.org> > Reviewed-by: Rohit Rao <rohitrao@chromium.org> > Reviewed-by: Hazem Ashmawy <hazems@chromium.org> > Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org> > Reviewed-by: Sorin Jianu <sorin@chromium.org> > Cr-Commit-Position: refs/heads/main@{#946615} Bug: 1094024
CI: |
This was referenced Jan 25, 2022
25 tasks
mkarolin
added a commit
that referenced
this pull request
Jan 26, 2022
Upgrade from Chromium 97 to Chromium 98
mkarolin
added a commit
that referenced
this pull request
Jan 26, 2022
Upgrade from Chromium 97 to Chromium 98
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes brave/brave-browser#19664
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
,npm run lint
,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan: