Modify execution condition of input field zoom

[Title]    Modify execution condition of input field zoom
[Issue#]   N/A
[Problem]  input field zoom does not work in specific case of email composer.
[Cause]    Execution condition is not considered in this case.
[Solution] Modify execution condition

Change-Id: Id2983e28a4e0e6e258d7f1f553aa740e66a3984d

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
index 70f8b05..3154c51 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp
@@ -116,9 +116,6 @@ PageClientImpl::PageClientImpl(EwkViewImpl* viewImpl)
 #if ENABLE(TIZEN_PRERENDERING_FOR_ROTATION)
     , m_waitFrameOfNewViewortSize(false)
 #endif
-#if ENABLE(TIZEN_WEBKIT2_INPUT_FIELD_ZOOM)
-    ,m_needFocusAdjust(false)
-#endif
     , m_nonemptyLayoutRendered(false)
 #endif // #if OS(TIZEN)
 {
@@ -505,8 +502,7 @@ void PageClientImpl::didChangeViewportProperties(const WebCore::ViewportAttribut
 
     // if IME is opened, visible content rect will be updated by ewk_view_focused_node_adjust()
 #if ENABLE(TIZEN_WEBKIT2_INPUT_FIELD_ZOOM)
-    if (m_needFocusAdjust) {
-        m_needFocusAdjust = false;
+    if (m_viewImpl->inputMethodContext()->isShow()) {
         if (ewk_view_focused_node_adjust(m_viewImpl->view(), EINA_FALSE, EINA_TRUE))
             return;
     }

diff --git a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
index 1f8d427..bcd2e29 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
+++ b/Source/WebKit2/UIProcess/API/efl/PageClientImpl.h
@@ -275,10 +275,6 @@ public:
 
     bool notifiedNonemptyLayout() { return m_nonemptyLayoutRendered; }
 
-#if ENABLE(TIZEN_WEBKIT2_INPUT_FIELD_ZOOM)
-    void setNeedFocusAdjust(bool needFocusAdjust) { m_needFocusAdjust = needFocusAdjust; }
-#endif
-
 #endif // #if OS(TIZEN)
 
 private:
@@ -489,10 +485,6 @@ protected:
     bool m_waitFrameOfNewViewortSize;
 #endif
 
-#if ENABLE(TIZEN_WEBKIT2_INPUT_FIELD_ZOOM)
-    bool m_needFocusAdjust;
-#endif
-
     bool m_nonemptyLayoutRendered;
 #endif // #if OS(TIZEN)
 };

diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp
index 2cf41ae..7126c8c 100755 (executable)
--- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp
+++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp
@@ -746,10 +746,6 @@ void InputMethodContextEfl::showIMFContext(const EditorState& editor, bool isUse
     else {
         if (isShow())
             ewk_view_focused_node_adjust(m_viewImpl->view());
-#if ENABLE(TIZEN_WEBKIT2_INPUT_FIELD_ZOOM)
-        else
-            m_viewImpl->pageClient->setNeedFocusAdjust(true);
-#endif
     }
 
     resetIMFContext();