diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 15:19:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-23 15:19:45 +0200 |
| commit | c683e47ee239ec6a36bfbdba0e9e2a3d9ed013d4 (patch) | |
| tree | dcec03c81268b536503f837c8d93d8a67328faa3 /Source/WebKit2/UIProcess/PageViewportController.cpp | |
| parent | 5ea819f80c6840c492386bfafbffb059c7e2091f (diff) | |
| download | qtwebkit-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/WebKit2/UIProcess/PageViewportController.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/PageViewportController.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/PageViewportController.cpp b/Source/WebKit2/UIProcess/PageViewportController.cpp index e010a6e52..88d52ba62 100644 --- a/Source/WebKit2/UIProcess/PageViewportController.cpp +++ b/Source/WebKit2/UIProcess/PageViewportController.cpp @@ -68,7 +68,6 @@ PageViewportController::PageViewportController(WebKit::WebPageProxy* proxy, Page { // Initializing Viewport Raw Attributes to avoid random negative or infinity scale factors // if there is a race condition between the first layout and setting the viewport attributes for the first time. - m_rawAttributes.devicePixelRatio = 1; m_rawAttributes.initialScale = 1; m_rawAttributes.minimumScale = 1; m_rawAttributes.maximumScale = 1; @@ -277,7 +276,7 @@ void PageViewportController::updateMinimumScaleToFit() if (m_viewportSize.isEmpty()) return; - float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize)); + float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize), devicePixelRatio()); if (!fuzzyCompare(minimumScale, m_minimumScaleToFit, 0.001)) { m_minimumScaleToFit = minimumScale; |