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 patches from Chromium 90.0.4430.41 to Chromium 90.0.4430.51 #8405

Merged
merged 3 commits into from
Apr 5, 2021
Merged

Upgrade patches from Chromium 90.0.4430.41 to Chromium 90.0.4430.51 #8405

merged 3 commits into from
Apr 5, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Mar 31, 2021 •
edited
Loading

Fixes brave/brave-browser#15052
Related PR: brave/brave-browser#15054

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
  • 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:

@mkarolin mkarolin added the CI/run-network-audit Run network-audit label Mar 31, 2021
@mkarolin mkarolin requested review from bbondy and bsclifton March 31, 2021 21:58
@mkarolin mkarolin requested review from samartnik and a team as code owners March 31, 2021 21:58
@mkarolin mkarolin self-assigned this Mar 31, 2021
@mkarolin mkarolin mentioned this pull request Mar 31, 2021
Merged
24 tasks
@mkarolin
Copy link
Collaborator Author

mkarolin commented Apr 1, 2021

CI failures:

  • Linux
3 tests failed:
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPlugins (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:117)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsNoBuiltinAvailable (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:197)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsReset (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:220)
  • MacOS
5 tests failed:
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPlugins (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:117)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsNoBuiltinAvailable (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:197)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsReset (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:220)
     RewardsContributionBrowserTest.SplitProcessOneTimeTip (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:868)
     RewardsContributionBrowserTest.SplitProcessorAutoContribution (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:732)
  • Windows
3 tests failed:
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPlugins (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:117)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsNoBuiltinAvailable (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:197)
     BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsReset (../../brave/browser/farbling/brave_navigator_plugins_farbling_browsertest.cc:220)

RewardsContributionBrowserTest on MacOS are known intermittently failing tests, unrelated to this PR.
BraveNavigatorPluginsFarblingBrowserTest on the other hand consistently failed across all Desktop platforms and require further investigation.

mkarolin added 2 commits April 1, 2021 14:27
@mkarolin
Revert "Adapt Brave's implementation of navigator.plugins farbling"
4a908a5 
This reverts commit 61fb284.

See https://bugs.chromium.org/p/chromium/issues/detail?id=1164635

The CL addressed in the above commit in cr90 bump was reversed.

https://chromium.googlesource.com/chromium/src/+/4478f8a413efda0f3c7ce6cc3b1fa1ee5dd756b7

commit 4478f8a413efda0f3c7ce6cc3b1fa1ee5dd756b7
Author: Mason Freed <masonfreed@chromium.org>
Date:   Thu Feb 4 18:22:48 2021 +0000

    Re-enable navigator.plugins for extensions and apps

    See crbug.com/1164635 for more context. Recently, the (web
    exposed) navigator.plugins and navigator.mimeTypes APIs
    were changed to return empty arrays. This broke feature
    detection on NaCl and PNaNl apps, so this CL re-enables
    these APIs for apps and extensions.

    This CL adds a setting GetAllowNonEmptyNavigatorPlugins()
    to WebPreferences that gets set to true for extensions and
    apps. If this setting is true, navigator.plugins and
    navigator.mimeTypes will continue to return their prior,
    full contents. This should not be web-exposed.

    This is mostly a complete cargo cult from crrev.com/c/2612624.

    The web-exposed behavior is tested by the existing web_test
    navigator-pluginarray.html [1].

    [1] https://source.chromium.org/chromium/chromium/src/+/master:third_party/blink/web_tests/plugins/na igator-pluginarray.html

    Bug: 1164635
    Fixed: 1171373

https://chromium.googlesource.com/chromium/src/+/65fe90f532f2ee967c9549473721919bc3492805

commit 65fe90f532f2ee967c9549473721919bc3492805
Author: Mason Freed <masonf@chromium.org>
Date:   Mon Mar 29 21:44:22 2021 +0000

    Disable NavigatorPluginsEmpty feature

    This feature was enabled by default [1] to check web compat, and after
    M90 went to Beta, a number of issues were raised ([2],[3]). As a
    result, this feature is being disabled. This will likely need to
    be merged back to M90 Beta.

    This CL removes the WPT that tests for empty arrays, and reinstates
    the prior layout test which enforces non-empty arrays.

    [1] https://chromium-review.googlesource.com/c/chromium/src/+/2629990
    [2] b/183094994
    [3] crbug.com/1191639

    (cherry picked from commit 1e6ce7bd03af8c474c39750cae3c94c1a24f89ef)

    Bug: 1164635, 1191639
@mkarolin
Replaced plugin_data.h patch with chromium_src override.
1130d97
samartnik
samartnik approved these changes Apr 5, 2021
View reviewed changes
Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

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

++

bsclifton
bsclifton approved these changes Apr 5, 2021
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

++

@bsclifton bsclifton merged commit 4552cbd into master Apr 5, 2021
@bsclifton bsclifton deleted the 90.0.4430.51_master_88 branch April 5, 2021 22:02
@mkarolin mkarolin added this to the 1.24.x - Nightly milestone Apr 5, 2021
mkarolin pushed a commit that referenced this pull request Apr 6, 2021
@bsclifton @mkarolin
Merge pull request #8405 from brave/90.0.4430.51_master_88
53dc04e 
Upgrade patches from Chromium 90.0.4430.41 to Chromium 90.0.4430.51
@mkarolin mkarolin mentioned this pull request Apr 6, 2021
Merged
24 tasks
kylehickinson pushed a commit that referenced this pull request Jan 4, 2024
@StephenHeaps
Fix: #8404: Invalid presentation over panel while loading keyring (#8405
a4fe356 
)

Fix invalid presentation over panel while loading.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton bsclifton approved these changes

@samartnik samartnik samartnik approved these changes

@bbondy bbondy Awaiting requested review from bbondy

Assignees

@mkarolin mkarolin

Labels
CI/run-network-audit Run network-audit
Projects
None yet
Milestone
1.24.x - Release
Development

Successfully merging this pull request may close these issues.

Upgrade from Chromium 90.0.4430.41 to Chromium 90.0.4430.51.
4 participants
@mkarolin @bsclifton @samartnik @brave-browser-releases