Merge WebKit at r73109: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / dom / ViewportArguments.cpp

diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp
index c3d1fc4..d3026e7 100644 (file)
--- a/WebCore/dom/ViewportArguments.cpp
+++ b/WebCore/dom/ViewportArguments.cpp
@@ -74,10 +74,26 @@ ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktop
         break;
     }
 
-    result.devicePixelRatio = float(deviceDPI / 160.0);
+    switch (int(args.targetDensityDpi)) {
+    case ViewportArguments::ValueDeviceDPI:
+        args.targetDensityDpi = deviceDPI;
+        break;
+    case ViewportArguments::ValueLowDPI:
+        args.targetDensityDpi = 120;
+        break;
+    case ViewportArguments::ValueAuto:
+    case ViewportArguments::ValueMediumDPI:
+        args.targetDensityDpi = 160;
+        break;
+    case ViewportArguments::ValueHighDPI:
+        args.targetDensityDpi = 240;
+        break;
+    }
+
+    result.devicePixelRatio = float(deviceDPI / args.targetDensityDpi);
 
     // Resolve non-'auto' width and height to pixel values.
-    if (deviceDPI != 1.0) {
+    if (result.devicePixelRatio != 1.0) {
         availableWidth /= result.devicePixelRatio;
         availableHeight /= result.devicePixelRatio;
         deviceWidth /= result.devicePixelRatio;