summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/ChromeClientImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit/chromium/src/ChromeClientImpl.cpp')
-rw-r--r--Source/WebKit/chromium/src/ChromeClientImpl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
index 9d0961c46..9d8a656bd 100644
--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -647,10 +647,11 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen
return;
Settings* settings = m_webView->page()->settings();
+ float devicePixelRatio = dpi / ViewportArguments::deprecatedTargetDPI;
// Call the common viewport computing logic in ViewportArguments.cpp.
ViewportAttributes computed = computeViewportAttributes(
args, settings->layoutFallbackWidth(), deviceRect.width, deviceRect.height,
- dpi / ViewportArguments::deprecatedTargetDPI, IntSize(deviceRect.width, deviceRect.height));
+ devicePixelRatio, IntSize(deviceRect.width, deviceRect.height));
restrictScaleFactorToInitialScaleIfNotUserScalable(computed);
@@ -664,10 +665,10 @@ void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArgumen
m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight));
bool needInitializePageScale = !m_webView->isPageScaleFactorSet();
- m_webView->setDeviceScaleFactor(computed.devicePixelRatio);
+ m_webView->setDeviceScaleFactor(devicePixelRatio);
m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
if (needInitializePageScale)
- m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * computed.devicePixelRatio);
+ m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * devicePixelRatio);
#endif
}