summaryrefslogtreecommitdiff
path: root/Source/WebCore/testing/InternalSettings.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-23 15:19:45 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-23 15:19:45 +0200
commitc683e47ee239ec6a36bfbdba0e9e2a3d9ed013d4 (patch)
treedcec03c81268b536503f837c8d93d8a67328faa3 /Source/WebCore/testing/InternalSettings.cpp
parent5ea819f80c6840c492386bfafbffb059c7e2091f (diff)
downloadqtwebkit-c683e47ee239ec6a36bfbdba0e9e2a3d9ed013d4.tar.gz
Imported WebKit commit 7136c2962f51f9ea361d9796b069374d0f41c922 (http://svn.webkit.org/repository/webkit/trunk@132195)
Build fix for Windows when building against Qt that was built without Angle support
Diffstat (limited to 'Source/WebCore/testing/InternalSettings.cpp')
-rw-r--r--Source/WebCore/testing/InternalSettings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index 8d8f0cb40..d101e2a59 100644
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -645,7 +645,7 @@ String InternalSettings::configurationForViewport(float devicePixelRatio, int de
ViewportArguments arguments = page()->viewportArguments();
ViewportAttributes attributes = computeViewportAttributes(arguments, defaultLayoutWidthForNonMobilePages, deviceWidth, deviceHeight, devicePixelRatio, IntSize(availableWidth, availableHeight));
- restrictMinimumScaleFactorToViewportSize(attributes, IntSize(availableWidth, availableHeight));
+ restrictMinimumScaleFactorToViewportSize(attributes, IntSize(availableWidth, availableHeight), devicePixelRatio);
restrictScaleFactorToInitialScaleIfNotUserScalable(attributes);
return "viewport size " + String::number(attributes.layoutSize.width()) + "x" + String::number(attributes.layoutSize.height()) + " scale " + String::number(attributes.initialScale) + " with limits [" + String::number(attributes.minimumScale) + ", " + String::number(attributes.maximumScale) + "] and userScalable " + (attributes.userScalable ? "true" : "false");