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 101 to Chromium 102. #12837

Merged
merged 117 commits into from
May 13, 2022
Merged

Upgrade from Chromium 101 to Chromium 102. #12837

merged 117 commits into from
May 13, 2022

Conversation

mkarolin
Copy link
Collaborator

Fixes brave/brave-browser#21976

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:

cdesouza-chromium and others added 19 commits May 13, 2022 18:01
Chromium change:
https://chromium.googlesource.com/chromium/src/+/6b031526902b8232aef756bd9d3f5665bbe623d5

commit 6b031526902b8232aef756bd9d3f5665bbe623d5
Author: Aishwarya Rajesh <aishwaryarj@google.com>
Date:   Fri Apr 29 17:17:56 2022 +0000

    [Toolbar Tablet] Update touch target sizes for toolbar elements

    This CL updates the sizes of toolbar elements (location bar including action/status icon buttons) to be a minimum of 48dp.
    - The background drawable for the location bar is updated as an inset drawable to preserve the existing height of 40dp.
    - The StatusView height is not matching the parent height of 48dp, so the touch delegate height has been updated to satisfy minimum size requirements.
    - The StatusView start padding has been removed.
    - An end padding of 8dp has been added to the URL action container. This warranted an update to the URL bar text view margin calculations.

    Before: https://hsv.googleplex.com/6710528861798400?node=19
    After: https://hsv.googleplex.com/6313415866843136?node=19

    Bug: 1297681
… it is not

behaving same as previous SetContentSettingRules which takes pointer.
So we need to set new rules every time or GetRendererContentSettingRules
and modify it.

related upstream change
https://chromium-review.googlesource.com/c/chromium/src/+/3540587
Replaced patch with resource override.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/6b031526902b8232aef756bd9d3f5665bbe623d5

commit 6b031526902b8232aef756bd9d3f5665bbe623d5
Author: Aishwarya Rajesh <aishwaryarj@google.com>
Date:   Fri Apr 29 17:17:56 2022 +0000

    [Toolbar Tablet] Update touch target sizes for toolbar elements

    This CL updates the sizes of toolbar elements (location bar including action/status icon buttons) to be a minimum of 48dp.
    - The background drawable for the location bar is updated as an inset drawable to preserve the existing height of 40dp.
    - The StatusView height is not matching the parent height of 48dp, so the touch delegate height has been updated to satisfy minimum size requirements.
    - The StatusView start padding has been removed.
    - An end padding of 8dp has been added to the URL action container. This warranted an update to the URL bar text view margin calculations.

    Before: https://hsv.googleplex.com/6710528861798400?node=19
    After: https://hsv.googleplex.com/6313415866843136?node=19

    Bug: 1297681
Chromium change:
chromium/chromium@b964b99

Add logic to track suggestions list scroll events.
This change allows us to learn how frequently our users need to
scroll the suggestions list in order to find what they are looking
for.

Bug: 1291761
Chromium change:
https://chromium.googlesource.com/chromium/src/+/6eb75d3c7b9ef4f90d7ee13471e0aac9f820967b

commit 6eb75d3c7b9ef4f90d7ee13471e0aac9f820967b
Author: Ian Vollick <vollick@chromium.org>
Date:   Fri Apr 22 21:44:59 2022 +0000

    [mparch] Add and start using Frame::IsCrossOriginToOutermostMainFrame

    With MPArch we can have a nested main frame, so for cases when we want
    to check that an embedded frame is cross-origin with respect to the
    outermost main frame, we should use IsCrossOriginToOutermostMainFrame.
    This CL changes a number of cases where the semantics appear to match
    outermost.

    This should have no effect outside the use of MPArch-based nested frame
    trees (only fenced frames at the moment).

    However, this is an interim step: the vast majority of current
    IsCrossOriginToMainFrame usages should be comparing with the outermost
    main frame, not the nearest. Ultimately, we will rename
    IsCrossOriginToMainFrame -> IsCrossOriginToNearestMainFrame, which will
    be used rarely, with all other instances using the 'outermost' check. A
    TODO has been added over IsCrossOriginToMainFrame about this next step.

    TODOs have been added for test coverage of these changes, similar to the
    approach taken in crrev.com/c/2988476 and crrev.com/c/3577677.

    More will be added after the mass rename in the sebsequent CL.

    Bug: 1318055
This change improves the patch for this class by substituting the patch
file with a macro override.
Chromium change:
chromium/chromium@1b9e3f2

[TabletGTS] Fix polish toolbar for first relaunch and a11y switcher
Fix polish toolbar for first relaunch and a11y switcher.
-Pass both the fullscreen and non-fullscreen tab switcher toolbar stubs
 when the polished tablet GTS is enabled.
-Choose which one to use based on our flag and if the a11y list switcher
 is enabled.

(cherry picked from commit 50515c1)

Bug: 1312980, 1317611
@emerick
Copy link
Contributor

emerick commented May 13, 2022

CI passed on all platforms; ready to merge.

@emerick emerick merged commit 02fa544 into master May 13, 2022
@emerick emerick deleted the cr102 branch May 13, 2022 20:56
emerick added a commit that referenced this pull request May 16, 2022
Upgrade from Chromium 101 to Chromium 102.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 101 to Chromium 102.