From 46500ca79410f175b84dfc95b415eba5581ff7c3 Mon Sep 17 00:00:00 2001 From: Joone Hur Date: Tue, 14 Jan 2014 11:32:20 -0800 Subject: [PATCH] Revert "Add pointer test on IMFcontext before use pointer." This patch allows virtual keyboard to pop up on textarea element, but we can only type one character into input and textarea elements, so we revert this change. This reverts commit 2753fe1ae8198cfdc4c0a47156b94ec1621b64cd. Change-Id: I9605efecbbc1ca75aa90914a7eb0bf7b3570529e --- Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp index 31300a6..5c25dc7 100755 --- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp +++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp @@ -310,14 +310,11 @@ PassOwnPtr InputMethodContextEfl::createIMFContext(Evas* canv void InputMethodContextEfl::handleMouseUpEvent(const Evas_Event_Mouse_Up*) { - resetIMFContext(); + ecore_imf_context_reset(m_context.get()); } void InputMethodContextEfl::handleKeyDownEvent(const Evas_Event_Key_Down* downEvent, bool* isFiltered) { - if (!m_context) - return; - Ecore_IMF_Event inputMethodEvent; ecore_imf_evas_event_key_down_wrap(const_cast(downEvent), &inputMethodEvent.key_down); @@ -410,10 +407,6 @@ void InputMethodContextEfl::setIMFContext(Ecore_IMF_Input_Panel_Layout layout, c if (m_contextList.contains(layout)) { revertIMFContext(); m_context = m_contextList.take(layout); - if (!m_context) { - m_context = createIMFContext(evas_object_evas_get(m_viewImpl->view())); - initializeIMFContext(m_context.get(), layout); - } } else if (!m_context || ecore_imf_context_input_panel_layout_get(m_context.get()) != layout) { OwnPtr context = createIMFContext(evas_object_evas_get(m_viewImpl->view())); if (m_context) -- 2.7.4