diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-30 06:39:36 -0500 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-30 06:39:36 -0500 |
| commit | e63ded6d720174699ee45e87f6be01335f2feebd (patch) | |
| tree | fdbbebe68e6457bb83cad7ad93c49a06c790b7ba /components/net/lib.rs | |
| parent | 0ec30a6127432e22c56c2ee73c28479481e3cffc (diff) | |
| parent | a09773e819d5c5529e27502c808afb6ee3da6586 (diff) | |
| download | servo-e63ded6d720174699ee45e87f6be01335f2feebd.tar.gz servo-e63ded6d720174699ee45e87f6be01335f2feebd.zip | |
Auto merge of #11413 - nox:content-blocker, r=nox+jdm+Ms2ger
Support content blocking
This is @jdm's rebased work from https://github.com/servo/servo/issues/9749#issuecomment-211115746 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 -->
Diffstat (limited to 'components/net/lib.rs')
| -rw-r--r-- | components/net/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/net/lib.rs b/components/net/lib.rs index 03e17955d3a..0af124da302 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -16,6 +16,7 @@ #[macro_use] extern crate bitflags; extern crate brotli; +extern crate content_blocker as content_blocker_parser; extern crate cookie as cookie_rs; extern crate device; extern crate devtools_traits; @@ -23,6 +24,7 @@ extern crate flate2; extern crate hyper; extern crate immeta; extern crate ipc_channel; +#[macro_use] extern crate lazy_static; #[macro_use] extern crate log; #[macro_use] #[no_link] extern crate matches; #[macro_use] @@ -49,6 +51,7 @@ pub mod about_loader; pub mod bluetooth_thread; pub mod chrome_loader; pub mod connector; +pub mod content_blocker; pub mod cookie; pub mod cookie_storage; pub mod data_loader; |