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 101 to Chromium 102 (Uplift to 1.39.x) #13345

Merged
merged 3 commits into from
May 18, 2022
Merged

Upgrade from Chromium 101 to Chromium 102 (Uplift to 1.39.x) #13345

merged 3 commits into from
May 18, 2022

Conversation

emerick
Copy link
Contributor

@emerick emerick commented May 16, 2022 •
edited by mkarolin
Loading

Fixes brave/brave-browser#21976
Fixes brave/brave-browser#22897
Fixes brave/brave-browser#22881

Uplift from #12837
Uplift from #13364
Uplift from #13353

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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, npm run lint, 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:

@emerick emerick added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) labels May 16, 2022
@emerick emerick requested a review from a team May 16, 2022 18:57
@emerick emerick requested review from a team, samartnik and iefremov as code owners May 16, 2022 18:57
@emerick emerick self-assigned this May 16, 2022
@emerick emerick requested review from a team and simonhong as code owners May 16, 2022 18:57
@emerick emerick removed request for a team, iefremov, simonhong and samartnik May 16, 2022 18:57
@github-actions github-actions bot added the potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false label May 16, 2022
@emerick emerick added this to the 1.39.x - Beta milestone May 16, 2022
@emerick emerick force-pushed the cr102-1.39.x branch 2 times, most recently from ae72722 to ac333af Compare May 16, 2022 20:12
@emerick
Merge pull request #12837 from brave/cr102
901191b 
Upgrade from Chromium 101 to Chromium 102.
@mkarolin mkarolin self-assigned this May 18, 2022
@mkarolin
Merge pull request #13364 from brave/fix-content-settings-rule-filtering
b5f386b 
Filter rules by outermost main frame URL before sending them to the renderer
@mkarolin
Merge pull request #13353 from brave/arm64-ios-build-problem-rust-opa…
15e4090 
…que-pointers

Temporary workaround to avoid arm64 ios build failure related to opaque pointers
kjozwiak
kjozwiak approved these changes May 18, 2022
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.39.x approved 👍

@kjozwiak kjozwiak merged commit 1732019 into 1.39.x May 18, 2022
@kjozwiak kjozwiak deleted the cr102-1.39.x branch May 18, 2022 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@emerick emerick

@mkarolin mkarolin

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/run-network-audit Run network-audit potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.39.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@emerick @kjozwiak @mkarolin