aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/encoding_support.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-03-17 11:01:13 +0100
committerSimon Sapin <simon.sapin@exyr.org>2017-03-19 22:30:35 +0100
commitf35b4e27b3e0b748e10662cfb6f18873258483b7 (patch)
tree841d5444c277958d74360a6d5bc3e77977b73ac4 /components/style/encoding_support.rs
parentb213daaa8818ff59557973c01c7d2612e9389abc (diff)
downloadservo-f35b4e27b3e0b748e10662cfb6f18873258483b7.tar.gz
servo-f35b4e27b3e0b748e10662cfb6f18873258483b7.zip
Replace RwLock<CssRules> with Locked<CssRules>
Diffstat (limited to 'components/style/encoding_support.rs')
-rw-r--r--components/style/encoding_support.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/components/style/encoding_support.rs b/components/style/encoding_support.rs
index 141291c896e..e485dc13cf0 100644
--- a/components/style/encoding_support.rs
+++ b/components/style/encoding_support.rs
@@ -12,7 +12,7 @@ use media_queries::MediaList;
use parser::ParserContextExtraData;
use self::encoding::{EncodingRef, DecoderTrap};
use servo_url::ServoUrl;
-use shared_lock::SharedRwLock;
+use shared_lock::{SharedRwLock, SharedRwLockWriteGuard};
use std::str;
use stylesheets::{Stylesheet, StylesheetLoader, Origin};
@@ -78,6 +78,7 @@ impl Stylesheet {
bytes: &[u8],
protocol_encoding_label: Option<&str>,
environment_encoding: Option<EncodingRef>,
+ guard: &mut SharedRwLockWriteGuard,
stylesheet_loader: Option<&StylesheetLoader>,
error_reporter: &ParseErrorReporter,
extra_data: ParserContextExtraData) {
@@ -85,6 +86,7 @@ impl Stylesheet {
bytes, protocol_encoding_label, environment_encoding);
Self::update_from_str(existing,
&string,
+ guard,
stylesheet_loader,
error_reporter,
extra_data)