aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-03-16 09:54:56 -0600
committerbors-servo <metajack+bors@gmail.com>2015-03-16 09:54:56 -0600
commit660ea05ddb3b17b0bb914cb09968cbcf7c6b1aec (patch)
tree3ad9c92ccaf65c4dde575fa588654969fedc84bb /tests/ref
parent1e1c97adb3cb44351df913daf8265de2edc74704 (diff)
parent51ceaed0d04783387dd8a99a75c7e4eadc9e50b9 (diff)
downloadservo-660ea05ddb3b17b0bb914cb09968cbcf7c6b1aec.tar.gz
servo-660ea05ddb3b17b0bb914cb09968cbcf7c6b1aec.zip
auto merge of #5173 : cyndis/servo/media-attr, r=jdm
Don't add a stylesheet if the current device does not match the media query specified in a link or style tag. Cheers, cyndis
Diffstat (limited to 'tests/ref')
-rw-r--r--tests/ref/basic.list2
-rw-r--r--tests/ref/css/displaynone.css4
-rw-r--r--tests/ref/external_media_query_link.html8
-rw-r--r--tests/ref/external_media_query_ref.html5
-rw-r--r--tests/ref/external_media_query_style.html12
5 files changed, 31 insertions, 0 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 6c554d2922f..942faedbe06 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -74,6 +74,8 @@ flaky_cpu == append_style_a.html append_style_b.html
== counters_simple_a.html counters_simple_ref.html
== data_img_a.html data_img_b.html
== empty_cells_a.html empty_cells_ref.html
+== external_media_query_link.html external_media_query_ref.html
+== external_media_query_style.html external_media_query_ref.html
== filter_opacity_a.html filter_opacity_ref.html
== filter_sepia_a.html filter_sepia_ref.html
== first_child_pseudo_a.html first_child_pseudo_b.html
diff --git a/tests/ref/css/displaynone.css b/tests/ref/css/displaynone.css
new file mode 100644
index 00000000000..525534e8ff4
--- /dev/null
+++ b/tests/ref/css/displaynone.css
@@ -0,0 +1,4 @@
+body {
+ display: none;
+}
+
diff --git a/tests/ref/external_media_query_link.html b/tests/ref/external_media_query_link.html
new file mode 100644
index 00000000000..36af6dfba30
--- /dev/null
+++ b/tests/ref/external_media_query_link.html
@@ -0,0 +1,8 @@
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="css/displaynone.css" media="print">
+ </head>
+ <body>
+ Hello
+ </body>
+</html>
diff --git a/tests/ref/external_media_query_ref.html b/tests/ref/external_media_query_ref.html
new file mode 100644
index 00000000000..6ac05f5f394
--- /dev/null
+++ b/tests/ref/external_media_query_ref.html
@@ -0,0 +1,5 @@
+<html>
+ <body>
+ Hello
+ </body>
+</html>
diff --git a/tests/ref/external_media_query_style.html b/tests/ref/external_media_query_style.html
new file mode 100644
index 00000000000..06d56a43ea3
--- /dev/null
+++ b/tests/ref/external_media_query_style.html
@@ -0,0 +1,12 @@
+<html>
+ <head>
+ <style type="text/css" media="print">
+ body {
+ display: none;
+ }
+ </style>
+ </head>
+ <body>
+ Hello
+ </body>
+</html>