diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-17 00:31:49 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-17 00:31:49 +0530 |
| commit | c1e6bc0714a11518afc608981ece954ac70bec93 (patch) | |
| tree | d7bd1568e2162c3d4703ef2736c7a86676d820f2 /components/script/dom | |
| parent | 4b0330937ab1f99e47c2ce312150a6dd44068380 (diff) | |
| parent | 987c9e63aa281dc913252ce54fdca162f4febecd (diff) | |
| download | servo-c1e6bc0714a11518afc608981ece954ac70bec93.tar.gz servo-c1e6bc0714a11518afc608981ece954ac70bec93.zip | |
Auto merge of #8538 - notriddle:github_resize, r=mbrubeck
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 -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/htmlmetaelement.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index dd0245104cb..5f581e2a433 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -60,6 +60,9 @@ impl HTMLMetaElement { } fn apply_viewport(&self) { + if !::util::prefs::get_pref("layout.viewport.enabled").as_boolean().unwrap_or(false) { + return; + } let element = self.upcast::<Element>(); if let Some(content) = element.get_attribute(&ns!(""), &atom!("content")).r() { let content = content.value(); |