diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/dom/ViewportArguments.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/dom/ViewportArguments.cpp')
| -rw-r--r-- | WebCore/dom/ViewportArguments.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/WebCore/dom/ViewportArguments.cpp b/WebCore/dom/ViewportArguments.cpp index c3d1fc4..d3026e7 100644 --- 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; |