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 -->
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

View file

@ -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();