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 135.0.7049.17 to Chromium 135.0.7049.26 #28208

Merged
merged 4 commits into from
Mar 20, 2025
Merged

Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26 #28208

merged 4 commits into from
Mar 20, 2025

Conversation

cdesouza-chromium
Copy link
Collaborator

Resolves brave/brave-browser#44781

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:

@cdesouza-chromium cdesouza-chromium requested review from a team as code owners March 19, 2025 14:08
@github-actions github-actions bot added CI/run-network-audit Run network-audit CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) labels Mar 19, 2025
@mkarolin mkarolin mentioned this pull request Mar 19, 2025
Merged
24 tasks
@mkarolin mkarolin added the CI/run-upstream-tests Run upstream unit and browser tests on Linux and Windows (otherwise only on Linux) label Mar 19, 2025
cdesouza-chromium and others added 4 commits March 19, 2025 18:08
@cdesouza-chromium @mkarolin
Update from Chromium 135.0.7049.17 to Chromium 135.0.7049.26.
0826125
@cdesouza-chromium @mkarolin
Update patches from Chromium 135.0.7049.17 to Chromium 135.0.7049.26.
c3827b5
@AlexeyBarabash @mkarolin
[cr136][Android] New arg at ChromeDialog.ctor - shouldPadForWindowInsets
ad504ce 
Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/1ba995f4717a3293bb336a6869d4b6e7ec4cc292

	[E2E] Wraps ChromeDialog with EdgeToEdgeBaseLayout

	Wraps ChromeDialog with EdgeToEdgeBaseLayout so that ChromeDialog has
	the correct padding for the status bar.

	Before:
	http://screencast/cast/NDU3MDg1MTAyNTM1NDc1MnwwN2M2ODVlYS1iNA

	After:
	http://screencast/cast/NTY4MjM0NTgxMzIxMzE4NHw0MzhmOWIxYi03Nw
	http://screencast/cast/NTkzODc2MjI3Mjk5NzM3Nnw5MzMzZGMzMi00Ng

	Bug: 399276320
	Change-Id: I37db9102a2a07f5416ffbd37549565bc127de8f2
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6336801
@mkarolin
[134.0.6998.118][Linux] Temporarily patch out a DCHECK.
cf28e48 
This DCHECK causes crashes for these 2 browser tests:

     DisabledURLSanitizerTest.JSApi (../../brave/browser/url_sanitizer/url_sanitizer_browsertest.cc:239)
     EnabledURLSanitizerTest.JSApi (../../brave/browser/url_sanitizer/url_sanitizer_browsertest.cc:235)

The test crash because the clipboard data already has data of type
chromium/x-internal-source-rfh-token when another attempt to insert the
same type happens.

Patching the DCHECK out just to get the bump through, but we need to
investigate what's happening here.

Likely culprit is this upstream change:

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

commit c7611079f28220b620f53364c0d1c4ba11539c93
Author: Dominique Fauteux-Chapleau <domfc@chromium.org>
Date:   Mon Mar 17 11:02:52 2025 -0700

    Set RFH token in clipboard only after writing other data

    See crbug.com/401379144 for an explanation of the fix and fix.

    (cherry picked from commit 1f19c23b4507a98c28fee554ccaf828e82f40f04)

    Bug: 401379144, 403574896
@mkarolin mkarolin merged commit 0bdf57b into master Mar 20, 2025
18 checks passed
@mkarolin mkarolin deleted the cr135.x branch March 20, 2025 14:24
@github-actions github-actions bot added this to the 1.78.x - Nightly milestone Mar 20, 2025
mkarolin added a commit that referenced this pull request Mar 20, 2025
@mkarolin
Merge pull request #28208 from brave/cr135.x
bea8da3 
Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26
@mkarolin mkarolin mentioned this pull request Mar 20, 2025
Merged
24 tasks
@brave-builds
Copy link
Collaborator

Released in v1.78.56

mkarolin added a commit that referenced this pull request Mar 21, 2025
@mkarolin
Merge pull request #28208 from brave/cr135.x
a935fe1 
Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26
mkarolin added a commit that referenced this pull request Mar 21, 2025
@mkarolin
Merge pull request #28208 from brave/cr135.x
996837b 
Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26
mkarolin added a commit that referenced this pull request Mar 25, 2025
@mkarolin
Merge pull request #28208 from brave/cr135.x
070c58b 
Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@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)
Projects
None yet
Milestone
1.78.x - Nightly
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 135.0.7049.17 to Chromium 135.0.7049.26
4 participants
@cdesouza-chromium @brave-builds @mkarolin @AlexeyBarabash