Support content blocking #11413
Merged
Support content blocking #11413
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Heads up! This PR modifies the following files:
|
highfive
added
the
S-awaiting-review
|
We should leave a TODO in the final commit, since we should use the actual request origin when it's available rather than inferring it via the referrer. |
|
r? @Ms2ger or someone else... |
|
☔ The latest upstream changes (presumably #11474) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@paulrouget wants a flag for it (#11500) but as long as we don't ship any builtin blocking rules it shouldn't matter to get this in as such. |
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #![allow(unsafe_code)] |
There was a problem hiding this comment.
You should be able to remove this.
|
New code was committed to pull request. |
|
@bors-servo r=nox+jdm+Ms2ger |
|
📌 Commit 8a81b40 has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
May 30, 2016
Support content blocking This is @jdm's rebased work from #9749 (comment) with a small addition with regard to cross-origin blocking. Mainly opening this for review and for further discussions. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11413) <!-- Reviewable:end -->
|
💔 Test failed - linux-dev |
highfive
added
S-tests-failed
highfive
added
the
S-awaiting-review
|
New code was committed to pull request. |
|
@bors-servo r=nox+jdm+Ms2ger Fixed the unit tests. |
|
📌 Commit 6a59e9e has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
May 30, 2016
Support content blocking This is @jdm's rebased work from #9749 (comment) with a small addition with regard to cross-origin blocking. Mainly opening this for review and for further discussions. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11413) <!-- Reviewable:end -->
|
💔 Test failed - linux-dev |
highfive
added
S-tests-failed
|
New code was committed to pull request. |
highfive
added
S-awaiting-review
|
@bors-servo r=nox+jdm+Ms2ger |
|
📌 Commit a09773e has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
May 30, 2016
Support content blocking This is @jdm's rebased work from #9749 (comment) with a small addition with regard to cross-origin blocking. Mainly opening this for review and for further discussions. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11413) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows |
highfive
removed
the
S-awaiting-merge
5 tasks
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is @jdm's rebased work from #9749 (comment) with a small addition with regard to cross-origin blocking. Mainly opening this for review and for further discussions.
This change is