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

Change adblock and TP from resource throttle to network delegate #592

Merged
merged 2 commits into from
Oct 9, 2018

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Oct 9, 2018

If approved, please wait to merge until builds and tests finish on Windows and Linux.

This also makes it so empty data urls are used by default instead of
blocking. Empty image data URLs for images.

Fix brave/brave-browser#1430
Fix brave/brave-browser#1118
Fix brave/brave-browser#1428
Fix brave/brave-browser#1362

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

This also makes it so empty data urls are used by default instead of
blocking.  Empty image data URLs for images.

Fix brave/brave-browser#1430
Fix brave/brave-browser#1118
Fix brave/brave-browser#1428
Fix brave/brave-browser#1362
@bbondy bbondy self-assigned this Oct 9, 2018
@bbondy bbondy requested a review from emerick October 9, 2018 16:33
}

if (IsBlockedResource(url)) {
request->Cancel();
Copy link
Member Author

@bbondy bbondy Oct 9, 2018

Choose a reason for hiding this comment

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

request->Cancel() not needed when you return net::ERR_ABORTED and actually it causes a debug assertion if you do it.

Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM.

@bbondy bbondy merged commit 4fe8ce9 into master Oct 9, 2018
bbondy added a commit that referenced this pull request Oct 9, 2018
Change adblock and TP from resource throttle to network delegate
bbondy added a commit that referenced this pull request Oct 9, 2018
Change adblock and TP from resource throttle to network delegate
@bbondy
Copy link
Member Author

bbondy commented Oct 9, 2018

master: 4fe8ce9
0.56.x: eb92768
0.55.x: 3b1effb

@bsclifton bsclifton deleted the network-delegate branch October 14, 2018 05:07
@bbondy bbondy added this to the 0.55.x - Release milestone Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants