Skip to content

Commit 2f19a26

Browse files
authored
Let Stylesheet::from_bytes() take a Arc<Locked<MediaList>> parameter (#251)
It was previously taking a `MediaList` parameter, and then wrap it in a locked arc. This was suboptimal for callers that already have an `Arc<Locked<MediaList>>`. Signed-off-by: Oriol Brufau <[email protected]>
1 parent 1e99bda commit 2f19a26

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

style/servo/encoding_support.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use crate::context::QuirksMode;
88
use crate::error_reporting::ParseErrorReporter;
99
use crate::media_queries::MediaList;
10-
use crate::shared_lock::SharedRwLock;
10+
use crate::shared_lock::{Locked, SharedRwLock};
1111
use crate::stylesheets::{AllowImportRules, Origin, Stylesheet, StylesheetLoader, UrlExtraData};
1212
use cssparser::{stylesheet_encoding, EncodingSupport};
1313
use servo_arc::Arc;
@@ -59,7 +59,7 @@ impl Stylesheet {
5959
protocol_encoding_label: Option<&str>,
6060
environment_encoding: Option<&'static encoding_rs::Encoding>,
6161
origin: Origin,
62-
media: MediaList,
62+
media: Arc<Locked<MediaList>>,
6363
shared_lock: SharedRwLock,
6464
stylesheet_loader: Option<&dyn StylesheetLoader>,
6565
error_reporter: Option<&dyn ParseErrorReporter>,
@@ -70,7 +70,7 @@ impl Stylesheet {
7070
&string,
7171
url_data,
7272
origin,
73-
Arc::new(shared_lock.wrap(media)),
73+
media,
7474
shared_lock,
7575
stylesheet_loader,
7676
error_reporter,

0 commit comments

Comments
 (0)