Bug 878029 - Update GetDefaultScaleInternal() in Gonk to match AOSP spec. r=mwu

widget/gonk/nsWindow.cpp

@@ -547,12 +547,17 @@ nsWindow::GetDPI()
 double
 nsWindow::GetDefaultScaleInternal()
 {
-    double rawscale = GetDPI() / 192.0;
+    float dpi = GetDPI();
-    if (rawscale < 1.25)
+    // The mean pixel density for mdpi devices is 160dpi, 240dpi for hdpi,
-        return 1;
+    // and 320dpi for xhdpi, respectively.
-    else if (rawscale < 1.75)
+    // We'll take the mid-value between these three numbers as the boundary.
-        return 1.5;
+    if (dpi < 200.0) {
-    return 2;
+        return 1.0; // mdpi devices.
+    }
+    if (dpi < 280.0) {
+        return 1.5; // hdpi devices.
+    }
+    return 2.0; // xhdpi devices.
 }
 
 LayerManager *