Bug 784704 - GetViewportInfo does not read minimum-scale and maximum-scale [r=jwir3]
authorMatt Brubeck <mbrubeck@mozilla.com>
Wed, 22 Aug 2012 13:14:11 -0700
changeset 105093 0cd39066334d84cb70172b381f2fb9a98ab02196
parent 105092 d7c041240db3ebd46ff2e9cdcda998c8cf27c4d9
child 105094 2b5032429f8002154baaf7534254a6f19841ff70
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersjwir3
bugs784704
milestone17.0a1
Bug 784704 - GetViewportInfo does not read minimum-scale and maximum-scale [r=jwir3]
content/base/src/nsContentUtils.cpp
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -5079,30 +5079,30 @@ nsContentUtils::GetViewportInfo(nsIDocum
   nsAutoString handheldFriendly;
   aDocument->GetHeaderData(nsGkAtoms::handheldFriendly, handheldFriendly);
 
   if (handheldFriendly.EqualsLiteral("true")) {
     return ret;
   }
 
   nsAutoString minScaleStr;
-  aDocument->GetHeaderData(nsGkAtoms::minimum_scale, minScaleStr);
+  aDocument->GetHeaderData(nsGkAtoms::viewport_minimum_scale, minScaleStr);
 
   nsresult errorCode;
   float scaleMinFloat = minScaleStr.ToFloat(&errorCode);
 
   if (errorCode) {
     scaleMinFloat = kViewportMinScale;
   }
 
   scaleMinFloat = NS_MIN(scaleMinFloat, kViewportMaxScale);
   scaleMinFloat = NS_MAX(scaleMinFloat, kViewportMinScale);
 
   nsAutoString maxScaleStr;
-  aDocument->GetHeaderData(nsGkAtoms::maximum_scale, maxScaleStr);
+  aDocument->GetHeaderData(nsGkAtoms::viewport_maximum_scale, maxScaleStr);
 
   // We define a special error code variable for the scale and max scale,
   // because they are used later (see the width calculations).
   nsresult scaleMaxErrorCode;
   float scaleMaxFloat = maxScaleStr.ToFloat(&scaleMaxErrorCode);
 
   if (scaleMaxErrorCode) {
     scaleMaxFloat = kViewportMaxScale;