Skip to content

Unified adblock catalog callbacks #20284

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
Merged
merged 7 commits into from
Sep 29, 2023
Merged

Unified adblock catalog callbacks #20284

merged 7 commits into from
Sep 29, 2023

Conversation

antonok-edm
Copy link
Collaborator

Resolves brave/brave-browser#33245

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:

@antonok-edm antonok-edm self-assigned this Sep 25, 2023
SergeyZhukovsky
SergeyZhukovsky approved these changes Sep 26, 2023
View reviewed changes
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

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

++

bridiver
bridiver reviewed Sep 26, 2023
View reviewed changes
components/brave_shields/browser/ad_block_service.cc
}
}

void AdBlockService::SourceProviderObserver::OnFilterSetCallbackLoaded(
Copy link
Collaborator

Choose a reason for hiding this comment

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

this naming is a bit weird, maybe CreateFilterSet and then OnFilterSetLoaded -> OnFilterSetCreated?

bridiver
bridiver reviewed Sep 26, 2023
View reviewed changes
components/brave_shields/browser/ad_block_service.cc
base::OnceCallback<void(rust::Box<adblock::FilterSet>*)> cb) {
task_runner_->PostTaskAndReplyWithResult(
FROM_HERE,
base::BindOnce(
Copy link
Collaborator

Choose a reason for hiding this comment

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

in a follow-up I think we should change the callback signature instead of adding another layer to the callbacks

bridiver
bridiver approved these changes Sep 26, 2023
View reviewed changes
Copy link
Collaborator

@bridiver bridiver left a comment

Choose a reason for hiding this comment

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

we can clean this up in the already planned follow-up from the original PR

@antonok-edm antonok-edm force-pushed the unified-adblock-catalog-callbacks branch from 657502e to 5d2dbdf Compare September 26, 2023 18:05
@thypon thypon removed their assignment Sep 27, 2023
@antonok-edm antonok-edm force-pushed the unified-adblock-catalog-callbacks branch from ad93e9a to 5c8cef5 Compare September 28, 2023 16:19
atuchin-m
atuchin-m reviewed Sep 28, 2023
View reviewed changes
components/brave_shields/browser/test_filters_provider.cc
void AddDATBufferToFilterSet(uint8_t permission_mask,
DATFileDataBuffer buffer,
rust::Box<adblock::FilterSet>* filter_set) {
(*filter_set)->add_filter_list_with_permissions(buffer, permission_mask);
Copy link
Collaborator

Choose a reason for hiding this comment

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

please add DCHECK for non-UI thread (in a follow-up)

@antonok-edm antonok-edm force-pushed the unified-adblock-catalog-callbacks branch 6 times, most recently from 2f39643 to 4e8456e Compare September 29, 2023 01:05
@antonok-edm antonok-edm force-pushed the unified-adblock-catalog-callbacks branch from 4e8456e to 0d84607 Compare September 29, 2023 01:57
@antonok-edm antonok-edm requested a review from a team as a code owner September 29, 2023 01:57
iefremov
iefremov approved these changes Sep 29, 2023
View reviewed changes
Copy link
Contributor

@iefremov iefremov left a comment

Choose a reason for hiding this comment

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

browser/net/* lgtm

@antonok-edm antonok-edm merged commit effbc32 into master Sep 29, 2023
@antonok-edm antonok-edm deleted the unified-adblock-catalog-callbacks branch September 29, 2023 15:02
@github-actions github-actions bot added CI/run-network-audit Run network-audit potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false labels Sep 29, 2023
@github-actions github-actions bot added this to the 1.60.x - Nightly milestone Sep 29, 2023
atuchin-m added a commit that referenced this pull request Oct 7, 2023
@atuchin-m
Revert "Merge pull request #20284 from brave/unified-adblock-catalog-…
ca00077 
…callbacks"

This reverts commit effbc32, reversing
changes made to 79c189e.
This was referenced Oct 7, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bridiver bridiver bridiver approved these changes

@iefremov iefremov iefremov approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

@atuchin-m atuchin-m atuchin-m approved these changes

Assignees

@iefremov iefremov

@goodov goodov

@antonok-edm antonok-edm

Labels
CI/run-network-audit Run network-audit potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Milestone
1.60.x - Release
Development

Successfully merging this pull request may close these issues.

ANR on AddDATBufferToFilterSet
7 participants
@antonok-edm @bridiver @iefremov @SergeyZhukovsky @atuchin-m @thypon @goodov