Force Zoom is not working immediately after returning to Page.

[Version]    common
[Title]      Force Zoom is not working immediately after returning to Page.
[BinType]    N/A
[Customer]   HQ
[Issue#]     WEB-3988
[Problem]    Force Zoom is not working immediately after returning to Page.
[Cause]      m_viewportConstraints is considered instead of viewportConstraints() for getting the minimum and maximum scale.
[Solution]   viewportConstraints() is replaced for m_viewportConstraints while getting the userSclable().
[Team]       WebCoreSupport
[Developer]  deepak.m1@samsung.com
[Request]    N/A
[Horizontal expansion] N/A
[SCMRequest] NA

Change-Id: Iefb2168a7ab5c4f54046405ba352683d983fb078

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index 3154c51..a2e230e 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@ -203,11 +203,11 @@ PageClientImpl::ViewportConstraints PageClientImpl::computeViewportConstraints(c
 
 double PageClientImpl::adjustScaleWithViewport(double scale)
 {
-    double minimumScale = min(m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale);
-    double maximumScale = max(m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale);
+    double minimumScale = min(viewportConstraints().minimumScale, viewportConstraints().maximumScale);
+    double maximumScale = max(viewportConstraints().minimumScale, viewportConstraints().maximumScale);
 #if ENABLE(TIZEN_DLOG_SUPPORT)
     TIZEN_LOGI("range: [%f, %f], min/max: [%f, %f], result: [%f]"
-        , m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale
+        , viewportConstraints().minimumScale, viewportConstraints().maximumScale
         , minimumScale, maximumScale
         , clampTo(scale, minimumScale, maximumScale));
 #endif
@@ -222,7 +222,7 @@ void PageClientImpl::updateViewportSize(const IntSize& viewportSize, const int a
 
 #if ENABLE(TIZEN_DLOG_SUPPORT)
     TIZEN_LOGI(" view size: [%d, %d], scale: [%.2f, %.2f, %.2f], resizeCount: [%d]", viewportSize.width(), viewportSize.height(),
-        m_scaleFactor, m_viewportConstraints.minimumScale, m_viewportConstraints.maximumScale, m_viewResizeCount);
+        m_scaleFactor, viewportConstraints().minimumScale, viewportConstraints().maximumScale, m_viewResizeCount);
 #endif
 
     // update viewport size of webkit

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
index bcd2e29..d22f048 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
@@ -110,7 +110,7 @@ public:
         WebCore::IntSize layoutSize;
     };
 
-    bool userScalable() { return fabs(m_viewportConstraints.minimumScale - m_viewportConstraints.maximumScale) > numeric_limits<float>::epsilon(); }
+    bool userScalable() { return fabs(viewportConstraints().minimumScale - viewportConstraints().maximumScale) > numeric_limits<float>::epsilon(); }
     ViewportConstraints viewportConstraints();
     ViewportConstraints computeViewportConstraints(const WebCore::ViewportAttributes&);
     double adjustScaleWithViewport(double);