Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace RwLock<CssRules> with Locked<CssRules>

Browse source
This commit is contained in:
Simon Sapin 2017-03-17 11:01:13 +01:00
parent b213daaa88
commit f35b4e27b3
15 changed files with 85 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/encoding_support.rs
View file

@ -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)