Checkin for timeless@bemail.org: Fixed rounding error making LARGER work for font sizes less than 9px. b=12461, r=attinasi@netscape.com,disttsc@bart.nl a=brendan@mozilla.org

content/html/style/src/nsStyleUtil.cpp

@@ -149,9 +149,9 @@ static nscoord OldCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize,
 		break;
 	default:
     if (aHTMLSize < 1) {
-      dFontSize = (7 * aBasePointSize / 10) / pow(1.1, 1 - aHTMLSize);
+      dFontSize = (7 * aBasePointSize / 10) * pow(1.1, aHTMLSize - 1);
     }
-    else {  // 7 < aHTMLSize
+    else {  // aHTMLSize > 7
       dFontSize = (3 * aBasePointSize) * pow(1.2, aHTMLSize - 7);
     }
 	}

content/shared/src/nsStyleUtil.cpp

@@ -149,9 +149,9 @@ static nscoord OldCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize,
 		break;
 	default:
     if (aHTMLSize < 1) {
-      dFontSize = (7 * aBasePointSize / 10) / pow(1.1, 1 - aHTMLSize);
+      dFontSize = (7 * aBasePointSize / 10) * pow(1.1, aHTMLSize - 1);
     }
-    else {  // 7 < aHTMLSize
+    else {  // aHTMLSize > 7
       dFontSize = (3 * aBasePointSize) * pow(1.2, aHTMLSize - 7);
     }
 	}

layout/html/style/src/nsStyleUtil.cpp

@@ -149,9 +149,9 @@ static nscoord OldCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize,
 		break;
 	default:
     if (aHTMLSize < 1) {
-      dFontSize = (7 * aBasePointSize / 10) / pow(1.1, 1 - aHTMLSize);
+      dFontSize = (7 * aBasePointSize / 10) * pow(1.1, aHTMLSize - 1);
     }
-    else {  // 7 < aHTMLSize
+    else {  // aHTMLSize > 7
       dFontSize = (3 * aBasePointSize) * pow(1.2, aHTMLSize - 7);
     }
 	}

layout/style/nsStyleUtil.cpp

@@ -149,9 +149,9 @@ static nscoord OldCalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize,
 		break;
 	default:
     if (aHTMLSize < 1) {
-      dFontSize = (7 * aBasePointSize / 10) / pow(1.1, 1 - aHTMLSize);
+      dFontSize = (7 * aBasePointSize / 10) * pow(1.1, aHTMLSize - 1);
     }
-    else {  // 7 < aHTMLSize
+    else {  // aHTMLSize > 7
       dFontSize = (3 * aBasePointSize) * pow(1.2, aHTMLSize - 7);
     }
 	}