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/resource_thread.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/resource_thread.rs')
| -rw-r--r-- | components/net/resource_thread.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index fe5bc48be78..facb0aa5994 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -6,6 +6,7 @@ use about_loader; use chrome_loader; use connector::{Connector, create_http_connector}; +use content_blocker::BLOCKED_CONTENT_RULES; use cookie; use cookie_storage::CookieStorage; use data_loader; @@ -453,7 +454,8 @@ impl CoreResourceManager { let http_state = HttpState { hsts_list: self.hsts_list.clone(), cookie_jar: self.cookie_jar.clone(), - auth_cache: self.auth_cache.clone() + auth_cache: self.auth_cache.clone(), + blocked_content: BLOCKED_CONTENT_RULES.clone(), }; http_loader::factory(self.user_agent.clone(), http_state, |