From: Yuni Jeong <yhnet.jung@samsung.com>
Date: Wed, 10 Apr 2013 08:36:45 +0000 (+0900)
Subject: Changed routine to finish composition for inputted texts when long tapping on input... 
X-Git-Tag: 2.1_release~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdf11d8830ee0891c33b87e267dd28052866e703;p=framework%2Fweb%2Fwebkit-efl.git

Changed routine to finish composition for inputted texts when long tapping on input box.

[Title] Changed routine to finish composition for inputted texts when long tapping on input box.
[Issue#] N_SE-32784
[Problem] when long tapping on input box of OSP App,
          all texts are removed and text selection is not working properly.
[Cause] In case that composition for inputted texts is not finished(there are underlined texts),
        when long tapping on input box of OSP App, routine to finish composition is not called.
        (In this case, browser app is working fine.)
[Solution] Moved code to finish composition for inputted texts.
           So, routine to finish composition for inputted texts is called in both browser app and OSP app.

Change-Id: I406415088a79d7d1986d7c7c9854ac02af766843
---

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/TextSelection.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/TextSelection.cpp
index 75039b6..3b2cfc1 100755
--- a/Source/WebKit2/UIProcess/API/efl/tizen/TextSelection.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/TextSelection.cpp
@@ -457,6 +457,9 @@ bool TextSelection::textSelectionDown(const IntPoint& point, bool isStartedTextS
     if (!isEnabled() && isTextSelectionHandleDowned())
         return false;
 
+#if ENABLE(TIZEN_ISF_PORT)
+    m_viewImpl->inputMethodContext()->resetIMFContext();
+#endif
     setIsTextSelectionMode(false);
 
     IntPoint contentsPoint = m_viewImpl->transformFromScene().mapPoint(point);
diff --git a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
index 364e8b4..a3ae935 100755
--- a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
@@ -1207,10 +1207,6 @@ void WebPage::selectClosestWord(const IntPoint& point, bool isStartedTextSelecti
 #endif
 
     if (hitTestResult.isContentEditable()) {
-#if ENABLE(TIZEN_ISF_PORT)
-        if (focusedFrame)
-            didCancelComposition(node);
-#endif
 #if ENABLE(TIZEN_INPUT_TAG_EXTENSION)
         if (!inputElement || (inputElement
             && !inputElement->isDateField() && !inputElement->isDateTimeField() && !inputElement->isDateTimeLocalField()