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.

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

Reuse procedural_filters.ts for ios #25694

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

atuchin-m
Copy link
Collaborator

Resolves

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

@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Sep 23, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@atuchin-m atuchin-m changed the title Add stub cosmetic_filters_core.ts Reuse procedural_filters.ts for ios Sep 24, 2024
@atuchin-m atuchin-m marked this pull request as ready for review September 24, 2024 15:40
@atuchin-m atuchin-m requested a review from a team as a code owner September 24, 2024 15:40
Copy link
Contributor

[puLL-Merge] - brave/brave-core@25694

Description

This PR introduces changes to the cosmetic filters functionality in the Brave browser, particularly for iOS. It moves the content cosmetic filters script from iOS-specific files to a shared location, making it available for both iOS and non-iOS platforms. The PR also updates the build configurations and script handling to accommodate these changes.

Changes

Changes

  1. components/cosmetic_filters/resources/data/BUILD.gn:

    • Added conditional compilation for iOS, introducing a new entry point for content_cosmetic_ios.js.
  2. components/cosmetic_filters/resources/data/content_cosmetic_ios.js:

    • Moved and modified the content of SelectorsPollerScript.js to this new file.
    • Updated copyright year and removed iOS-specific wrapper.
    • Imported applyCompiledSelector and compileProceduralSelector from procedural_filters.
  3. components/resources/BUILD.gn:

    • Added dependency on cosmetic filters resources for all platforms.
  4. ios/brave-ios/Package.swift:

    • Removed references to SelectorsPollerScript.js and ProceduralFilters.js.
  5. ios/brave-ios/Sources/Brave/Frontend/Browser/User Scripts/ScriptFactory.swift:

    • Updated script generation to use AdblockService.cosmeticFiltersScript().
  6. Removed ios/brave-ios/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Sandboxed/ProceduralFilters.js.

  7. ios/browser/api/brave_shields/BUILD.gn:

    • Added dependencies on cosmetic filters and static resources.
  8. ios/browser/api/brave_shields/adblock_service.h and adblock_service.mm:

    • Added a new class method cosmeticFiltersScript to retrieve the cosmetic filters script.

Possible Issues

  1. The removal of iOS-specific files and integration into a shared component might lead to unexpected behavior if there are iOS-specific requirements not accounted for in the shared implementation.
  2. The change in how the cosmetic filters script is loaded and executed on iOS might affect performance or functionality if not thoroughly tested.

Security Hotspots

No significant security hotspots were identified in this change. However, as with any change involving content scripts and filters, thorough testing should be done to ensure that the new implementation doesn't introduce any vulnerabilities or unintended behavior in content blocking.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build puLL-Merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants