Skip to content

Revert unified adblock catalog #20442

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.

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

Merged
merged 6 commits into from
Oct 9, 2023
Merged

Conversation

atuchin-m
Copy link
Collaborator

@atuchin-m atuchin-m commented Oct 7, 2023

Reverting because of major perf problem in the original PR. perf thread
For #19946
For #20284
For #20227
Resolves brave/brave-browser#33520

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:

…callbacks"

This reverts commit effbc32, reversing
changes made to 79c189e.
This reverts commit 9a55916.
@atuchin-m atuchin-m self-assigned this Oct 7, 2023
@atuchin-m atuchin-m requested review from a team and iefremov as code owners October 7, 2023 20:42
@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 Oct 7, 2023
@@ -31,24 +31,27 @@ namespace {

typedef struct ListDefaultOverrideConstants {
const raw_ref<const base::Feature> feature;
const char* local_override_pref;
Copy link
Contributor

Choose a reason for hiding this comment

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

@atuchin-m atuchin-m enabled auto-merge October 8, 2023 07:11
@atuchin-m atuchin-m merged commit 4ad53ad into master Oct 9, 2023
@atuchin-m atuchin-m deleted the revert-unified-adblock-catalog branch October 9, 2023 12:25
@github-actions github-actions bot added this to the 1.61.x - Nightly milestone Oct 9, 2023
@atuchin-m atuchin-m restored the revert-unified-adblock-catalog branch October 9, 2023 13:22
brave-builds added a commit that referenced this pull request Oct 9, 2023
@atuchin-m atuchin-m deleted the revert-unified-adblock-catalog branch October 10, 2023 17:26
kjozwiak pushed a commit that referenced this pull request Oct 10, 2023
antonok-edm added a commit that referenced this pull request Oct 14, 2023
…atalog"

This reverts commit 4ad53ad, reversing
changes made to ec922be.
antonok-edm added a commit that referenced this pull request Oct 30, 2023
…atalog"

This reverts commit 4ad53ad, reversing
changes made to ec922be.
antonok-edm added a commit that referenced this pull request Jan 11, 2024
…atalog"

This reverts commit 4ad53ad, reversing
changes made to ec922be.
@antonok-edm antonok-edm mentioned this pull request Jan 12, 2024
24 tasks
antonok-edm added a commit that referenced this pull request Jan 20, 2024
…atalog"

This reverts commit 4ad53ad, reversing
changes made to ec922be.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit needs-security-review potential-layer-violation-fixes This PR touches a BUILD.gn file with check_includes=false
Projects
None yet
Development

Successfully merging this pull request may close these issues.

perf: CPU usage issue related to adblock changes
6 participants