X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Source%2FWebKit2%2FWebProcess%2FWebCoreSupport%2FWebEditorClient.cpp;h=b1912332e81488a3eb07d583ce2ca56db873ffce;hb=37760e8438d76ea4d3e501354e1bb0531ce00592;hp=3c1d933330f08b1e2a8526b4f7e108c7de5b9371;hpb=a55099a1f44c5c3c9c12fdc70463e5fd096c6e1a;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index 3c1d933..b191233 100755
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -191,7 +191,12 @@ void WebEditorClient::respondToChangedSelection(Frame* frame)
         return;
 
     EditorState state = m_page->editorState();
-#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
+
+#if ENABLE(TIZEN_ISF_PORT) || ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
+    const EditorState& currentState = m_page->currentEditorState();
+    if (currentState.hasComposition && currentState.inputMethodContextID != state.inputMethodContextID)
+        didCancelComposition(reinterpret_cast<Node*>(currentState.inputMethodContextID));
+
     m_page->setEditorState(state);
 #endif
 
@@ -470,10 +475,6 @@ void WebEditorClient::willSetInputMethodState()
 
 void WebEditorClient::setInputMethodState(bool active)
 {
-#if ENABLE(TIZEN_ISF_PORT)
-    m_page->send(Messages::WebPageProxy::SetInputMethodState(active));
-    return;
-#endif
     notImplemented();
 }