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

Auto merge of #8538 - notriddle:github_resize, r=mbrubeck

Browse source 
Ignore `<meta name=viewport>` if `@viewport` is ignored

Fixes #8373

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8538)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-17 00:31:49 +05:30
commit c1e6bc0714
6 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -4227,6 +4227,18 @@
"url": "/_mozilla/css/vertical_align_top_span_a.html"
}
],
"css/viewport_ignore_desktop.html": [
{
"path": "css/viewport_ignore_desktop.html",
"references": [
[
"/_mozilla/css/viewport_ignore_desktop_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
@ -9424,6 +9436,18 @@
"url": "/_mozilla/css/vertical_align_top_span_a.html"
}
],
"css/viewport_ignore_desktop.html": [
{
"path": "css/viewport_ignore_desktop.html",
"references": [
[
"/_mozilla/css/viewport_ignore_desktop.html",
"=="
]
],
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
@ -9802,4 +9826,4 @@
"rev": null,
"url_base": "/_mozilla/",
"version": 2
}
}

13
tests/wpt/mozilla/tests/css/viewport_ignore_desktop.html Normal file
View file

@ -0,0 +1,13 @@
<!doctype html>
<meta charset="utf-8">
<title>viewport is ignored on desktop</title>
<link rel="match" href="viewport_ignore_desktop_ref.html">
<script>
if (window.userAgent.indexOf("Mobile") === -1) {
var meta = document.creatElement("meta");
meta.name = "viewport";
meta.content = "width=100";
document.getElementsByTagName("head")[0].appendChild(meta);
}
</script>
<p style='border: solid'>Test

2
tests/wpt/mozilla/tests/css/viewport_ignore_desktop.html.ini Normal file
View file

@ -0,0 +1,2 @@
prefs: ["layout.viewport.enabled:false"]

4
tests/wpt/mozilla/tests/css/viewport_ignore_desktop_ref.html Normal file
View file

@ -0,0 +1,4 @@
<!doctype html>
<meta charset="utf-8">
<title>viewport is ignored on desktop</title>
<p style='border: solid'>Test