From 978d9c8be601428f8e72395efc5303dbe0095f05 Mon Sep 17 00:00:00 2001 From: SangYong Park Date: Thu, 5 Sep 2013 11:09:08 +0900 Subject: [PATCH] Revert "Set keyboard mode" This reverts commit 6f0eae351921fca5976d63a664e5d829953d3f0a. Change-Id: I8f6a3db5a23f9a2b3817021360455c0b251907e3 --- .../UIProcess/efl/InputMethodContextEfl.cpp | 22 ---------------------- .../WebKit2/UIProcess/efl/InputMethodContextEfl.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp index 2151adb..86ac060 100755 --- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp +++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp @@ -600,8 +600,6 @@ void InputMethodContextEfl::onFocusIn() ecore_imf_context_focus_in(m_context.get()); ecore_imf_context_input_panel_show(m_context.get()); - - setKeyboardMode(true); } void InputMethodContextEfl::onFocusOut() @@ -622,8 +620,6 @@ void InputMethodContextEfl::onFocusOut() ecore_imf_context_input_panel_hide(m_context.get()); ecore_imf_context_focus_out(m_context.get()); - - setKeyboardMode(false); } void InputMethodContextEfl::revertIMFContext() @@ -745,8 +741,6 @@ void InputMethodContextEfl::showIMFContext(const EditorState& editor, bool isUse resetIMFContext(); ecore_imf_context_focus_in(m_context.get()); ecore_imf_context_input_panel_show(m_context.get()); - - setKeyboardMode(true); } void InputMethodContextEfl::hideIMFContext() @@ -770,8 +764,6 @@ void InputMethodContextEfl::hideIMFContext() ecore_imf_context_focus_out(m_context.get()); } - setKeyboardMode(false); - m_focused = false; revertIMFContext(); } @@ -808,20 +800,6 @@ void InputMethodContextEfl::removeIMFContext(uintptr_t contextID) takeContext(contextID); } -void InputMethodContextEfl::setKeyboardMode(bool isOn) -{ - Evas_Object* parent = elm_object_parent_widget_get(m_viewImpl->view()); - while (parent) { - const char* type = elm_object_widget_type_get(parent); - if (type && !strcmp(type, "elm_win")) { - elm_win_keyboard_mode_set(parent, isOn ? ELM_WIN_KEYBOARD_ON : ELM_WIN_KEYBOARD_OFF); - return; - } - - parent = elm_object_parent_widget_get(parent); - } -} - void InputMethodContextEfl::requestFakeKeyEvent() { if (m_doNotHandleFakeKeyEvent || m_fakeKeyEventTimer.isActive()) diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h index 23c204c..fc2f304 100755 --- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h +++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.h @@ -103,8 +103,6 @@ private: void showInputPicker(const EditorState&); #endif - void setKeyboardMode(bool); - void requestFakeKeyEvent(); void fakeKeyEventTimerFired(WebCore::Timer*); #endif -- 2.7.4