+2011-01-23 Kenneth Rohde Christiansen <kenneth@webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Viewport meta: Always adjust device dimensions to the device pixel ratio.
+
+ * dom/ViewportArguments.cpp:
+ (WebCore::computeViewportAttributes):
+
2011-01-23 Andreas Kling <kling@webkit.org>
Reviewed by Kenneth Rohde Christiansen.
ASSERT(availableWidth > 0 && availableHeight > 0);
- switch (int(args.width)) {
- case ViewportArguments::ValueDesktopWidth:
- args.width = desktopWidth;
- break;
- case ViewportArguments::ValueDeviceWidth:
- args.width = deviceWidth;
- break;
- case ViewportArguments::ValueDeviceHeight:
- args.width = deviceHeight;
- break;
- }
-
- switch (int(args.height)) {
- case ViewportArguments::ValueDesktopWidth:
- args.height = desktopWidth;
- break;
- case ViewportArguments::ValueDeviceWidth:
- args.height = deviceWidth;
- break;
- case ViewportArguments::ValueDeviceHeight:
- args.height = deviceHeight;
- break;
- }
-
switch (int(args.targetDensityDpi)) {
case ViewportArguments::ValueDeviceDPI:
args.targetDensityDpi = deviceDPI;
deviceHeight /= result.devicePixelRatio;
}
+ switch (int(args.width)) {
+ case ViewportArguments::ValueDesktopWidth:
+ args.width = desktopWidth;
+ break;
+ case ViewportArguments::ValueDeviceWidth:
+ args.width = deviceWidth;
+ break;
+ case ViewportArguments::ValueDeviceHeight:
+ args.width = deviceHeight;
+ break;
+ }
+
+ switch (int(args.height)) {
+ case ViewportArguments::ValueDesktopWidth:
+ args.height = desktopWidth;
+ break;
+ case ViewportArguments::ValueDeviceWidth:
+ args.height = deviceWidth;
+ break;
+ case ViewportArguments::ValueDeviceHeight:
+ args.height = deviceHeight;
+ break;
+ }
+
// Clamp values to range defined by spec and resolve minimum-scale and maximum-scale values
if (args.width != ViewportArguments::ValueAuto)
args.width = min(float(10000), max(args.width, float(1)));