Limit minimum scale factor under maximum scale factor

[framework/web/webkit-efl.git] / Source / WebKit2 / UIProcess / API / efl / PageClientImpl.cpp

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index e8d6199..4694e79 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@ -176,7 +176,8 @@ PageClientImpl::ViewportConstraints PageClientImpl::computeViewportConstraints(c
 
 double PageClientImpl::adjustScaleWithViewport(double scale)
 {
-    return clampTo(scale, m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale);
+    double minimumScale = min(m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale);
+    return clampTo(scale, minimumScale, m_viewportConstraints.maximumScale);
 }
 
 #if USE(TILED_BACKING_STORE) && ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE)
@@ -230,7 +231,7 @@ double PageClientImpl::availableMinimumScale()
     IntSize contentsSize = m_viewImpl->page()->contentsSize();
     double horizontalMinScale = max(((double)viewSize().width() / contentsSize.width()), 0.25);
     double verticalMinScale = max(((double)viewSize().height() / contentsSize.height()), 0.25);
-    return max(horizontalMinScale, verticalMinScale);
+    return min(max(horizontalMinScale, verticalMinScale), m_viewportConstraints.maximumScale);
 }
 
 void PageClientImpl::fitViewportToContent()