Auto merge of #14232 - servo:moar-locks, r=upsuper

CSSOM: Make Stylesheet fields have their own synchronization

<!-- Please describe your changes on the following line: -->

r? @upsuper

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix bug 1314208.

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/14232)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-21 19:33:57 -06:00 committed by GitHub
commit 30867001d1
12 changed files with 56 additions and 56 deletions

1
ports/cef/Cargo.lock generated
View file

@ -1203,7 +1203,6 @@ dependencies = [
"serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_url 0.0.1",
"style 0.0.1",
"style_traits 0.0.1",
"util 0.0.1",
"webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
]

View file

@ -178,8 +178,8 @@ pub extern "C" fn Servo_StyleSheet_Empty(mode: SheetParsingMode) -> RawServoStyl
SheetParsingMode::eUserSheetFeatures => Origin::User,
SheetParsingMode::eAgentSheetFeatures => Origin::UserAgent,
};
let sheet = Arc::new(Stylesheet::from_str("", url, origin, Box::new(StdoutErrorReporter),
extra_data));
let sheet = Arc::new(Stylesheet::from_str(
"", url, origin, Default::default(), Box::new(StdoutErrorReporter), extra_data));
unsafe {
transmute(sheet)
}
@ -208,8 +208,8 @@ pub extern "C" fn Servo_StyleSheet_FromUTF8Bytes(data: *const nsACString,
referrer: Some(GeckoArcURI::new(referrer)),
principal: Some(GeckoArcPrincipal::new(principal)),
}};
let sheet = Arc::new(Stylesheet::from_str(input, url, origin, Box::new(StdoutErrorReporter),
extra_data));
let sheet = Arc::new(Stylesheet::from_str(
input, url, origin, Default::default(), Box::new(StdoutErrorReporter), extra_data));
unsafe {
transmute(sheet)
}

View file

@ -1289,7 +1289,6 @@ dependencies = [
"serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"servo_url 0.0.1",
"style 0.0.1",
"style_traits 0.0.1",
"util 0.0.1",
"webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
]