Upgrade from Chromium 87 to Chromium 88. #6957
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 tasks
petemill
approved these changes
Nov 18, 2020
simonhong
approved these changes
Nov 18, 2020
iefremov
reviewed
Nov 18, 2020
chromium_src/third_party/blink/renderer/modules/plugins/dom_plugin_array.cc
Show resolved
Hide resolved
iefremov
reviewed
Nov 18, 2020
| @@ -24,7 +24,8 @@ class NotificationHandler : public NotificationHandler_ChromiumImpl { | |||
| SHARING = 6, | |||
| ANNOUNCEMENT = 7, | |||
| NEARBY_SHARE = 8, | |||
| BRAVE_ADS = 9, | |||
| NOTIFICATIONS_MUTED = 9, | |||
| BRAVE_ADS = 10, | |||
There was a problem hiding this comment.
is it safe to change? Maybe leave it alone (i.e. = 9) and allow google to grow the list further?
There was a problem hiding this comment.
We shifted it a few times before, but it might be safer to do the way you suggest.
There was a problem hiding this comment.
Changed in b68fd94f93cadd9af994f1a446494d9001995734
iefremov
reviewed
Nov 18, 2020
| @@ -52,7 +52,7 @@ String PluginReplacementName(std::mt19937_64* prng) { | |||
|
|
|||
| void FarblePlugins(DOMPluginArray* owner, | |||
| HeapVector<Member<DOMPlugin>>* dom_plugins) { | |||
| LocalFrame* frame = owner->GetFrame(); | |||
| LocalFrame* frame = owner->DomWindow()->GetFrame(); | |||
There was a problem hiding this comment.
cc @pilgrim-brave maybe also check owner->DomWindow() != nullptr
There was a problem hiding this comment.
Fixed in de34845572138db27937115bb331702e8b407c83
iefremov
approved these changes
Nov 18, 2020
5b7c6cb to
a5c926e
Compare
This is an upstream patch that will come with a later version of cr88. Upstream change: https://chromium.googlesource.com/chromium/src.git/+/5cd34161e55cfd5ed7e07d119e01dcea89ab4170 Reland "Reland "Only pass executable sections to OnDllLoaded for patching"" This is a reland of afc7242791c579c0918ee4c4abe2ade827015418 Same as before but now avoids a hidden memset from auto-var-init that broke during early loading on component builds. We immediately populate the memory so this is safe. Original change's description: > Reland "Only pass executable sections to OnDllLoaded for patching" > > This is a reland of df9e203bd49929a482bac0918c50c1e44420a9ed > > Original change's description: > > Only pass executable sections to OnDllLoaded for patching > > > > On recent Windows insider builds GetModuleHandleExW loads sections for > > inspection as non-executable images, rather than as files. This leads > > to our hooks detecting the SEC_IMAGE attribute and potentially patching > > functions (e.g. for user32.dll). > > > > This caused content_browsertests to fail as it pinned user32.dll in some > > processes. With this change, the tests run again. > > > > See crbug.com/1143397 for a full discussion. > > > > Bug: 1143397
HTML that use `if expr=` need to have the definitions of conditions in the `preprocess_grit` targets.
Removed NIK method we added (GetEffectiveTopFrameOrigin) because Chromium's own GetTopFrameSite performs the same functionality. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/e6e4f399a1c124f7aef06cce915dcb87d3a7facf commit e6e4f399a1c124f7aef06cce915dcb87d3a7facf Author: Matt Menke <mmenke@chromium.org> Date: Thu Oct 8 11:41:29 2020 +0000 Remove original origin fields from NetworkIsolationKey. They're mostly not being used, since IsolationInfo now mirrors those fields. While the fields in IsolationInfo still have one issue the fields in NetworkIsolationKey had (namely, they may be site instead of origin, for requests created from a NetworkIsolationKey), this does resolve one of the issues with the field: NetworkIsolationKeys are used as keys, and having two NIKs that are logically equal buy observably different is a potential source of bugs. Bug: None
Chromium change: https://source.chromium.org/chromium/chromium/src/+/aa298022efdaaf3637faf741990ad311f5978cee commit aa298022efdaaf3637faf741990ad311f5978cee Author: Wei Li <weili@chromium.org> Date: Tue Oct 27 18:37:21 2020 +0000 Remove SetFocusForPlatform() API SetFocusForPlatform() was used to override Button and its subclasses' focus behavior. Now the platform default focus behavior becomes Button's default setting. This API is no longer needed. Bug: 1001103
Otherwise the compiler gets confused with the class method which takes no parameters.
Chromium change: https://source.chromium.org/chromium/chromium/src/+/e20efed600a08b5fa7f5197ef991ecfea4cba0e0 commit e20efed600a08b5fa7f5197ef991ecfea4cba0e0 Author: Mike Dougherty <michaeldo@chromium.org> Date: Fri Oct 16 18:17:54 2020 +0000 [iOS] Ensure all breadcrumbs are persisted Previously, only breadcrumbs associated with BrowserStates were being persisted across sessions. These events were stored inside the BrowserState storage directory. This CL moves the persisted events to files outside of the BrowserState directories. Additionally, it listens for breadcrumbs from all BreadcrumbManager instances. This allows all breadcrumbs to persist across application cold starts. Bug:1117667
It's no longer needed due to the changes from brave/brave-browser#13060
bridiver
approved these changes
Dec 8, 2020
|
The only CI failure is |
mkarolin
added a commit
that referenced
this pull request
Jan 4, 2021
Upgrade from Chromium 87 to Chromium 88.
This was referenced Jan 4, 2021
mkarolin
added a commit
that referenced
this pull request
Jan 8, 2021
Upgrade from Chromium 87 to Chromium 88.
mkarolin
added a commit
that referenced
this pull request
Jan 12, 2021
Upgrade from Chromium 87 to Chromium 88.
mkarolin
added a commit
that referenced
this pull request
Jan 12, 2021
Upgrade from Chromium 87 to Chromium 88.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes brave/brave-browser#12331
Related PR: brave/brave-browser#12332
Fixes brave/brave-browser#10190 (thanks @diracdeltas for testing)
Submitter Checklist:
npm run lint,npm run gn_check)git rebase master(if needed).git rebase -ito squash commits (if needed).QA/YesorQA/No) to the associated issuerelease-notes/includeorrelease-notes/exclude) to the associated issueTest Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.