From f7f56c1ae124c740c6aa04a9921156137568ce0f Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 16 Sep 2010 12:30:00 -0400 Subject: [PATCH] Bug 597144 - "Set viewport width and height if both are specified in meta tag" [r=mark.finkle] --- mobile/chrome/content/browser.js | 2 +- mobile/chrome/tests/browser_viewport_04.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js index c72dc6e2d9d..bc6ac64acf9 100644 --- a/mobile/chrome/content/browser.js +++ b/mobile/chrome/content/browser.js @@ -2389,7 +2389,7 @@ Tab.prototype = { viewportH = viewportW * (screenH / screenW); } else if (!validW && validH) { viewportW = viewportH * (screenW / screenH); - } else { + } else if (!validW && !validH) { viewportW = kDefaultBrowserWidth; viewportH = kDefaultBrowserWidth * (screenH / screenW); } diff --git a/mobile/chrome/tests/browser_viewport_04.html b/mobile/chrome/tests/browser_viewport_04.html index 0bda442942c..97eb8931c4c 100644 --- a/mobile/chrome/tests/browser_viewport_04.html +++ b/mobile/chrome/tests/browser_viewport_04.html @@ -1,7 +1,7 @@ Browser Viewport Page 04 - +