Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1325878: Pass the MediaList down to Servo, making <style media> work. r=xidorn

Browse source 
MozReview-Commit-ID: BUCSQJs2CNI
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-04-11 22:13:16 +08:00
parent 482740bb11
commit ac7bc414d9
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
14 changed files with 63 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/unit/style/media_queries.rs
View file

@ -6,6 +6,7 @@ use cssparser::{Parser, SourcePosition};
use euclid::size::TypedSize2D;
use servo_url::ServoUrl;
use std::borrow::ToOwned;
use std::sync::Arc;
use style::Atom;
use style::error_reporting::ParseErrorReporter;
use style::media_queries::*;
@ -28,8 +29,10 @@ fn test_media_rule<F>(css: &str, callback: F)
{
let url = ServoUrl::parse("http://localhost").unwrap();
let css_str = css.to_owned();
let lock = SharedRwLock::new();
let media_list = Arc::new(lock.wrap(MediaList::empty()));
let stylesheet = Stylesheet::from_str(
css, url, Origin::Author, Default::default(), SharedRwLock::new(),
css, url, Origin::Author, media_list, lock,
None, &CSSErrorReporterTest);
let mut rule_count = 0;
let guard = stylesheet.shared_lock.read();
@ -55,8 +58,10 @@ fn media_queries<F>(guard: &SharedRwLockReadGuard, rules: &[CssRule], f: &mut F)
fn media_query_test(device: &Device, css: &str, expected_rule_count: usize) {
let url = ServoUrl::parse("http://localhost").unwrap();
let lock = SharedRwLock::new();
let media_list = Arc::new(lock.wrap(MediaList::empty()));
let ss = Stylesheet::from_str(
css, url, Origin::Author, Default::default(), SharedRwLock::new(),
css, url, Origin::Author, media_list, lock,
None, &CSSErrorReporterTest);
let mut rule_count = 0;
ss.effective_style_rules(device, &ss.shared_lock.read(), |_| rule_count += 1);