Auto merge of #16246 - servo:revert-per-doc, r=jdm

Revert to per-process shared lock for author-origin stylesheets

Fixes https://github.com/servo/servo/issues/16097
Reopens https://github.com/servo/servo/issues/16027

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16246)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-03 16:16:07 -05:00 committed by GitHub
commit b6b6608ca3
4 changed files with 19 additions and 1 deletions

1
Cargo.lock generated
View file

@ -2250,6 +2250,7 @@ dependencies = [
"ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.4 (git+https://github.com/servo/rust-mozjs)",
"jstraceable_derive 0.0.1",
"lazy_static 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",