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

Label::CalculatePreferredSize() marked as final #20767

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Label::CalculatePreferredSize() marked as final #20767

merged 1 commit into from
Nov 1, 2023

Conversation

cdesouza-chromium
Copy link
Collaborator

@cdesouza-chromium cdesouza-chromium commented Oct 31, 2023 •
edited
Loading

This function is now marked as final, however there is another entry in the overload set that can be used in its place for the override in BraveVPNStatusLabel.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889

Resolves

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 lint, 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
Label::CalculatePreferredSize() marked as final
4e0ea64 
This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889
@cdesouza-chromium cdesouza-chromium merged commit 78593d0 into master Nov 1, 2023
@cdesouza-chromium cdesouza-chromium deleted the use-alt-calculate-preferred-size branch November 1, 2023 03:41
@github-actions github-actions bot added this to the 1.62.x - Nightly milestone Nov 1, 2023
mherrmann pushed a commit that referenced this pull request Nov 9, 2023
@cdesouza-chromium @mherrmann
Label::CalculatePreferredSize() marked as final (#20767)
0fd4d0f 
This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889
@mkarolin mkarolin mentioned this pull request Nov 28, 2023
Merged
25 tasks
mkarolin pushed a commit that referenced this pull request Nov 28, 2023
@cdesouza-chromium @mkarolin
Label::CalculatePreferredSize() marked as final (#20767)
dbdb923 
This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889
mkarolin pushed a commit that referenced this pull request Nov 30, 2023
@cdesouza-chromium @mkarolin
Label::CalculatePreferredSize() marked as final (#20767)
d635725 
This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889
kjozwiak pushed a commit that referenced this pull request Dec 1, 2023
@mkarolin @cdesouza-chromium
@emerick @samartnik @AlexeyBarabash
Upgrade from Chromium 119 to Chromium 120 (uplift to 1.61.x). (#21135)
587ce3e 
* Merge pull request #20434 from brave/cr120

Upgrade from Chromium 119 to Chromium 120.

* Updated chrome-VERSION.patch from Chromium 119.0.6045.163 to Chromium 120.0.6099.35.

* Additional assert_ts.js -> assert.js for 1.61.x.

Chromium change:

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

commit f7a2ea671005530e7a891bba411a34bfd1b3b4cd
Author: dpapad <dpapad@chromium.org>
Date:   Mon Oct 16 21:13:04 2023 +0000

    WebUI: Rename assert_ts.ts to assert.ts, part 7 (last)

    In this part updating one remaining reference in ui/file_manager/ and
    removing assert_ts.ts.

    assert_ts.ts used the "_ts" suffix to differentiate from the previously
    existing assert.js file. The latter no longer exists and the "_ts"
    suffix can be dropped.

    Fixed: 1291526

* Remove `SidePanelCoordinator` `final` keyword substitution (#20765)

`SidePanelCoordinator` is tagged upstream as `final`, and as a
workaround to be able to derive from it, an override had been introduced
at some point to replace the keyword `final` with naught. This type of
redefinition is unreliable, as it is UB, and it also becomes highly
viral.

This change replaces the substitution with a patch. The substitution was
removing the `final` keyword from the signature of other functions in
different headers, and leaving it with no token to indicate the function
is an override, causing a build failure.

* `Label::CalculatePreferredSize()` marked as `final` (#20767)

This function is now marked as `final`, however there is another entry
in the overload set that can be used in its place for the override in
`BraveVPNStatusLabel`.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6

commit bf2f84a8c4f27e399e05bf4730a29152f6a8b0b6
Author: weidongliu <liuwd8@gmail.com>
Date:   Mon Oct 30 15:59:03 2023 +0000

    views: Mark CalculatePreferredSize() of views::Label as final

    Views::Label now has two functions to calculate the preferred size. This
    can cause some unexpected errors. CalculatePreferredSize() is now
    expected to be deprecated. Therefore, mark it as final to prevent
    overrided by subclasses.

    Bug: 1346889

* Revert "Disable kPowerBookmarksSidePanel feature flag"

This reverts commit 237341e.

* Java files formatting.

* Fix `BraveBrowsingDataRemoverDelegate` substitution (#21034)

This override has been missing a matching header since it was
introduced, and this has been causing linking to fail in every upstream
occurrence of `ChromeBrowsingDataRemoverDelegateFactory::GetForProfile`
as the return type in the header was not being replaced accordingly.

This changes adds the changes to the header as well, and provides an
inclusion `BraveBrowsingDataRemoverDelegate` in the shadow file, to
allow the compiler to understand that
`BraveBrowsingDataRemoverDelegate*` is pefectly convertible to
`ChromeBrowsingDataRemoverDelegate`.

* [Android] Move JNI classes to jni_zero namespace

* Disabled failing upstream browser tests.

* Merge pull request #21152 from brave/maxk-fix-page-info-cookies-separator

[cr120 follow-up] Removes an extra separator in cookies page info view.

* Merge pull request #21153 from brave/maxk-redirect-on-device-data-to-cookies

[cr120 follow-up] Redirect On-device data link to cookies page.

* Merge pull request #21166 from brave/maxk-hide-hover-card-image-toggle

[cr120 follow-up] Hide Settings->Appearance hover card toggle.

* Fixed crash accessing 'send to devices' in share menu via Sync (#21168)

Fixes brave/brave-browser#34636

Related Chromium commit:
https://source.chromium.org/chromium/chromium/src/+/84ed1f62ecd64bbfc3d2c4775a6e80a6b0e9defb

Clean up SendTabToSelfSigninPromo flag

Enabled by default in M119 (https://crrev.com/c/4905024), can be
cleaned up in M120.

Fixed: 1479693, 1295204
Change-Id: Ic778e9c886a5d9391fb5da7510d166952481fe21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4905343
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Commit-Queue: Victor Vianna <victorvianna@google.com>
Cr-Commit-Position: refs/heads/main@{#1204655}

* Merge pull request #21169 from brave/120.0.6099.56_master

Upgrade from Chromium 120.0.6099.35 to Chromium 120.0.6099.56.

* Updated chrome-VERSION.patch from Chromium 120.0.6099.35 to Chromium 120.0.6099.56.

---------

Co-authored-by: cdesouza-chromium <cdesouza@brave.com>
Co-authored-by: Emerick Rogul <erogul@brave.com>
Co-authored-by: Artem Samoilenko <artem@brave.com>
Co-authored-by: AlexeyBarabash <AlexeyBarabash@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonhong simonhong simonhong approved these changes

Assignees

@cdesouza-chromium cdesouza-chromium

Labels
None yet
Projects
None yet
Milestone
1.62.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@cdesouza-chromium @simonhong