Skip to content

Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x)#3385

Merged
bsclifton merged 27 commits into0.68.xfrom
c77_0.68.x
Sep 11, 2019
Merged

Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x)#3385
bsclifton merged 27 commits into0.68.xfrom
c77_0.68.x

Conversation

@bsclifton
Copy link
Member

@bsclifton bsclifton commented Sep 8, 2019

Uplift of #3358 and #3400
Fixes brave/brave-browser#5375
Fixes brave/brave-browser#5966
Related brave/brave-browser#5943

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

This includes the following uplifts:

And then the following PRs created against this branch:

@bsclifton bsclifton added the CI/skip Do not run CI builds (except noplatform) label Sep 8, 2019
@bsclifton bsclifton self-assigned this Sep 8, 2019
@bsclifton bsclifton force-pushed the c77_0.68.x branch 3 times, most recently from 12e75e7 to ec3481b Compare September 9, 2019 06:36
bsclifton and others added 4 commits September 9, 2019 00:38
Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.65
Issue 2351: NetworkService: Untie shield callbacks from net::URLRequest.
Untie more network callbacks from net::URLRequest
@bsclifton bsclifton force-pushed the c77_0.68.x branch 2 times, most recently from 21d0b45 to 5afd93e Compare September 9, 2019 07:42
@bsclifton bsclifton added this to the 0.68.x - Release Hotfix 2 milestone Sep 9, 2019
@bsclifton bsclifton removed the CI/skip Do not run CI builds (except noplatform) label Sep 9, 2019
bsclifton and others added 6 commits September 9, 2019 20:47
Sync: never show service error status in browser UI
Fix brave/brave-browser#5249

The previous method of wvh->SetWebUIProperty has issues in that the rvh does not always fire the 'ready' event, especially when navigating 'back'. Using DataSource is a more consistent chromium method for sending properties to the JS context. However, this is usually used for non-changing data. Whilst an UpdateDataSource function does exist, that kind of data is usually pulled from the JS via an explicit call to the C++ WebUI, so we may have to go down that route. The issue with the implementation in this commit is that a page may miss the 'updated' events that fire, for example due to have being navigated away and then back to the page.
SetWebUIProperty was also causing issues with browser tests in guest windows.

- Creates JS -> C++ functions to get data for: Preferences, Stats and PrivateProperties (alternativeSearchEngine). loadTimeData is also not a great place for data which can change. Although a DataSource (i.e. strings.js and loadTimeData.data) can be updated, it is complicated and is not normal chromium pattern. Since this data is not required exactly at page creation (since it is not read via static HTML but via React in JS), then we can afford the time it takes to request this data via JS.
- Converting to a JS API required refactoring some of the app store / reducer initialization, including creating the concept of 'initial data' which is any data required to render the page. Since we need Preferences to know what to show, and we need Stats since they are shown on the initial page load, then those are contained within.

Includes some minor cleanup with regard to 'API' separation and definition.
- Fixes storage being loaded multiple times during redux init (the function is called with an empty state param 3 times, so the state was being loaded from storage 3 times).
- Only saves to local storage the state which we will be re-used.
petemill and others added 9 commits September 9, 2019 23:22
The feature is not ready yet and whilst a flag exists, we default it to on (unlike Chromium) since we use the backend of the feature as a component for the Brave Ads feature
This fixes a regression unintentionally introduced with #3033 where port would not added (but chromium would add port when you block/unblock using omnibox)

Fixes brave/brave-browser#5973
Generate symbols using single thread
@bsclifton bsclifton changed the title WIP - uplifting C77 to 0.68.x Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (Uplift to 0.68.x) Sep 11, 2019
@bsclifton bsclifton changed the title Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (Uplift to 0.68.x) Update patches from Chromium 76.0.3809.132 to Chromium 77.0.3865.75 (uplift to 0.68.x) Sep 11, 2019
@bsclifton bsclifton added the CI/skip Do not run CI builds (except noplatform) label Sep 11, 2019
@bsclifton bsclifton requested a review from a team September 11, 2019 22:16
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 0.68.x approved. Please make sure that all the correct labels are being used and all associated issues that are relevant to this PR are moved into the correct milestone.

@crazy-max
Copy link
Contributor

Looks like upgrading to Chromium 77.0.3865.75 breaks #795 👀 (see portapps/brave-portable#33)
Maybe a patch has not been updated? Any clue @bsclifton? Thanks!

@bsclifton
Copy link
Member Author

cc: @mkarolin

@mkarolin
Copy link
Collaborator

The patches and chromium_src overrides from #795 are in place and at least --disable-machine-id gets the override triggered. Haven't checked the encryption flag, but the patch/override are still in place.

@crazy-max
Copy link
Contributor

@mkarolin Just check and --disable-machine-id works yes but --disable-encryption-win don't.

fmarier pushed a commit that referenced this pull request Oct 29, 2019
Update Nightly channel to: 0.63.0
@crazy-max
Copy link
Contributor

crazy-max commented Nov 4, 2019

@mkarolin @bsclifton Do you have any clue to fix this? I would like to help but there are many changes in this PR. Maybe components-os_crypt-os_crypt_win.cc.patch has to be updated following this commit on chromium?

@webgoto
Copy link

webgoto commented Nov 28, 2019

I have a problem that --disable-encryption-win doesn't work because I'm using a Brave portable.

@crazy-max
Copy link
Contributor

@mkarolin @bsclifton I've createda PR #4194 to fix this issue if you want to take a look. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI/skip Do not run CI builds (except noplatform)

Projects

None yet

Development

Successfully merging this pull request may close these issues.