author | Zafar Ahmed Ansari <zafar142007@gmail.com> |
Sun, 24 Aug 2014 06:59:47 +0530 | |
changeset 201240 | cf45937d8c9de8416f55e4c83817bfe245380ae2 |
parent 201239 | ec2f8320d372db0fe75868ef9cb392a2a2f1c913 |
child 201241 | 0c2f375a7d2b96da54d79c0c758e2efefcf946c9 |
push id | 27365 |
push user | ryanvm@gmail.com |
push date | Mon, 25 Aug 2014 15:24:30 +0000 |
treeherder | mozilla-central@23c70481ed91 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | kats |
bugs | 1038880 |
milestone | 34.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -6319,18 +6319,17 @@ var ViewportHandler = { if (defaultZoom >= 0) { scale = defaultZoom / 1000; autoSize = false; } } scale = this.clamp(scale, kViewportMinScale, kViewportMaxScale); minScale = this.clamp(minScale, kViewportMinScale, kViewportMaxScale); - maxScale = this.clamp(maxScale, minScale, kViewportMaxScale); - + maxScale = this.clamp(maxScale, (isNaN(minScale) ? kViewportMinScale : minScale), kViewportMaxScale); if (autoSize) { // If initial scale is 1.0 and width is not set, assume width=device-width autoSize = (widthStr == "device-width" || (!widthStr && (heightStr == "device-height" || scale == 1.0))); } let isRTL = aWindow.document.documentElement.dir == "rtl";