Remove unnecessary code about data-list
authorbunam.jeon <bunam.jeon@samsung.com>
Wed, 16 Oct 2013 06:09:25 +0000 (15:09 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 16 Oct 2013 09:54:09 +0000 (09:54 +0000)
[Title]    Remove unnecessary code about data-list
[Issue#]   N/A
[Problem]  N/A
[Cause]    data-list is implemented in the new UI. So, the existing code is no longer needed.
[Solution] Remove unnecessary code about data-list

Change-Id: I6fd93a2b464a895ada293a037fefb64a2baf5488

Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
Source/WebKit2/UIProcess/API/efl/ewk_view.h
Source/WebKit2/UIProcess/API/efl/ewk_view_private.h
Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.cpp
Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp

index a09b746..9109139 100755 (executable)
@@ -246,11 +246,6 @@ void _ewk_orientation_unlock(Ewk_View_Smart_Data *sd);
 static Eina_Bool _ewk_view_input_picker_show(Ewk_View_Smart_Data*, Ewk_Input_Type, const char* inputValue);
 #endif
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-static Eina_Bool _ewk_view_data_list_show(Ewk_View_Smart_Data*, Ewk_Input_Type, Eina_List*);
-static Eina_Bool _ewk_view_data_list_hide(Ewk_View_Smart_Data*, Ewk_Input_Type);
-#endif
-
 #if ENABLE(TIZEN_INPUT_COLOR_PICKER)
 static Eina_Bool _ewk_input_picker_color_request(Ewk_View_Smart_Data*, int, int, int, int);
 static Eina_Bool _ewk_input_picker_color_dismiss(Ewk_View_Smart_Data*);
@@ -1203,10 +1198,6 @@ Eina_Bool ewk_view_smart_class_set(Ewk_View_Smart_Class* api)
 #if ENABLE(TIZEN_INPUT_TAG_EXTENSION)
     api->input_picker_show = _ewk_view_input_picker_show;
 #endif
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-    api->data_list_show = _ewk_view_data_list_show;
-    api->data_list_hide = _ewk_view_data_list_hide;
-#endif
 #if ENABLE(TIZEN_SCREEN_ORIENTATION_SUPPORT_INTERNAL)
     api->orientation_lock = _ewk_orientation_lock;
     api->orientation_unlock = _ewk_orientation_unlock;
@@ -2010,24 +2001,6 @@ static Eina_Bool _ewk_view_input_picker_show(Ewk_View_Smart_Data* smartData, Ewk
 }
 #endif
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-static Eina_Bool _ewk_view_data_list_show(Ewk_View_Smart_Data* smartData, Ewk_Input_Type inputType, Eina_List* optionList)
-{
-    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
-
-    impl->inputPicker->showDataList(inputType, optionList);
-    return true;
-}
-
-static Eina_Bool _ewk_view_data_list_hide(Ewk_View_Smart_Data* smartData, Ewk_Input_Type inputType)
-{
-    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
-
-    impl->inputPicker->hideDataList(inputType);
-    return true;
-}
-#endif
-
 #if ENABLE(TIZEN_INPUT_COLOR_PICKER)
 static Eina_Bool _ewk_input_picker_color_request(Ewk_View_Smart_Data* smartData, int r, int g, int b, int a)
 {
@@ -4140,51 +4113,6 @@ const char* ewk_view_focused_input_element_value_get(Evas_Object* ewkView)
 #endif // ENABLE(TIZEN_INPUT_TAG_EXTENSION)
 }
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-void ewkViewDataListShowRequest(Evas_Object* ewkView, Ewk_Input_Type inputType, Vector<String> optionList)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
-    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api->data_list_show);
-
-    if (impl->dataList)
-        ewkViewDataListHideRequest(ewkView, inputType);
-
-    for (Vector<String>::const_iterator it = optionList.begin(); it != optionList.end(); ++it) {
-        String value = *it;
-        impl->dataList = eina_list_append(impl->dataList, eina_stringshare_add(value.utf8().data()));
-    }
-
-    smartData->api->data_list_show(smartData, inputType, impl->dataList);
-}
-
-void ewkViewDataListHideRequest(Evas_Object* ewkView, Ewk_Input_Type inputType)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
-    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
-    EINA_SAFETY_ON_NULL_RETURN(impl->dataList);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api);
-    EINA_SAFETY_ON_NULL_RETURN(smartData->api->data_list_hide);
-
-    impl->deleteDataList();
-
-    smartData->api->data_list_hide(smartData, inputType);
-}
-#endif
-
-void ewk_view_data_list_close(Evas_Object* ewkView, const char* value)
-{
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
-    EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
-
-    impl->deleteDataList();
-
-    ewk_view_focused_input_element_value_set(ewkView, value);
-#endif
-}
-
 Eina_Bool ewk_view_horizontal_panning_hold_get(Evas_Object* ewkView)
 {
 #if ENABLE(TIZEN_GESTURE)
index 8a64e8d..147a42e 100755 (executable)
@@ -184,11 +184,6 @@ struct Ewk_View_Smart_Class {
     Eina_Bool (*input_picker_show)(Ewk_View_Smart_Data *sd, Ewk_Input_Type inputType, const char* inputValue);
 //#endif
 
-//#if ENABLE(TIZEN_DATALIST_ELEMENT)
-    Eina_Bool (*data_list_show)(Ewk_View_Smart_Data *sd, Ewk_Input_Type inputType, Eina_List *optionList);
-    Eina_Bool (*data_list_hide)(Ewk_View_Smart_Data *sd, Ewk_Input_Type inputType);
-// #endif
-
 // #if ENABLE(SCREEN_ORIENTATION_SUPPORT) && ENABLE(TIZEN_SCREEN_ORIENTATION_SUPPORT)
     Eina_Bool (*orientation_lock)(Ewk_View_Smart_Data *sd, int orientations);
     void (*orientation_unlock)(Ewk_View_Smart_Data *sd);
@@ -283,7 +278,7 @@ typedef void (*Ewk_Web_App_Icon_URLs_Get_Callback)(Eina_List *icon_urls, void *u
  * @see EWK_VIEW_SMART_CLASS_INIT_VERSION
  * @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
  */
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 /**
  * Initializer to zero a whole Ewk_View_Smart_Class structure.
@@ -1329,16 +1324,6 @@ EAPI void ewk_view_focused_input_element_value_set(Evas_Object* o, const char* v
 EAPI const char* ewk_view_focused_input_element_value_get(Evas_Object* o);
 // #endif // ENABLE(TIZEN_INPUT_TAG_EXTENSION)
 
-// #if ENABLE(TIZEN_DATALIST_ELEMENT)
-/**
- * Closes data list picker
- *
- * @param o view object contains data list element
- * @param value value to be set to the input element
- */
-EAPI void ewk_view_data_list_close(Evas_Object *o, const char *value);
-//#endif // ENABLE(TIZEN_DATALIST_ELEMENT)
-
 /**
  * Selects index of current popup menu.
  *
index 3c6901e..8be84c3 100755 (executable)
@@ -208,11 +208,6 @@ void ewkViewInputPickerRequest(Evas_Object* ewkView, Ewk_Input_Type inputType, c
 void ewkViewGetWindowFrame(Evas_Object* ewkView, int *x, int *y, int *w, int *h);
 #endif
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-void ewkViewDataListShowRequest(Evas_Object* ewkView, Ewk_Input_Type inputType, Vector<String> optionList);
-void ewkViewDataListHideRequest(Evas_Object* ewkView, Ewk_Input_Type inputType);
-#endif
-
 #if ENABLE(TIZEN_WEBKIT2_GET_TEXT_STYLE_FOR_SELECTION)
 void  ewkViewTextStyleState(Evas_Object* ewkView, const WebCore::IntPoint& startPoint, const WebCore::IntPoint& endPoint);
 Ewk_Text_Style* ewkTextStyleCreate(const WebKit::EditorState editorState, const WebCore::IntPoint& startPoint, const WebCore::IntPoint& endPoint);
index 412ed6a..e0b4eb1 100755 (executable)
@@ -210,202 +210,6 @@ void InputPicker::show(Ewk_Input_Type inputType, const char* inputValue)
         ewk_week_popup(inputValue);
 }
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-void InputPicker::_data_list_popup_response_cb(void* data,  Evas_Object* obj, void* eventInfo)
-{
-    InputPicker* inputPicker = static_cast<InputPicker*>(data);
-    const char* selectedItem = elm_entry_entry_get(inputPicker->m_pickerLayout->dataListEditField);
-    ewk_view_data_list_close(inputPicker->m_ewkView, selectedItem);
-
-    if (inputPicker->m_pickerLayout->popup) {
-        evas_object_del(inputPicker->m_pickerLayout->popup);
-        inputPicker->m_pickerLayout->popup = 0;
-    }
-
-    delete inputPicker->m_pickerLayout;
-    inputPicker->m_pickerLayout = 0;
-
-    inputPicker->m_dataList = 0;
-}
-
-void InputPicker::_data_list_popup_response_cancel_cb(void* data,  Evas_Object* obj, void* eventInfo)
-{
-    InputPicker* inputPicker = static_cast<InputPicker*>(data);
-
-    if (inputPicker->m_pickerLayout->popup) {
-        evas_object_del(inputPicker->m_pickerLayout->popup);
-        inputPicker->m_pickerLayout->popup = 0;
-    }
-
-    delete inputPicker->m_pickerLayout;
-    inputPicker->m_pickerLayout = 0;
-
-    inputPicker->m_dataList = 0;
-}
-
-void InputPicker::_data_list_selected_cb(void* data, Evas_Object* obj, void* eventInfo)
-{
-    InputPicker* inputPicker = static_cast<InputPicker*>(data);
-    Elm_Object_Item* selectedItem = static_cast<Elm_Object_Item*>(eventInfo);
-    Elm_Object_Item* item = elm_list_first_item_get(obj);
-
-    int index = 0;
-    while (item) {
-        if (item == selectedItem)
-            break;
-        index++;
-        item = elm_list_item_next(item);
-    }
-
-    Eina_List* list = 0;
-    void* listItem = 0;
-    int listIndex = 0;
-    EINA_LIST_FOREACH(inputPicker->m_dataList, list, listItem) {
-        if (listItem && index == listIndex)
-            elm_entry_entry_set(inputPicker->m_pickerLayout->dataListEditField, static_cast<char*>(listItem));
-
-        listIndex++;
-    }
-}
-
-static void _eraser_clicked_cb(void* data, Evas_Object* obj, const char* emission, const char* source)
-{
-    Evas_Object* entry = static_cast<Evas_Object*>(data);
-    elm_entry_entry_set(entry, "");
-}
-
-static void _changed_cb(void* data, Evas_Object* obj, void* eventInfo)
-{
-    Evas_Object* layout = static_cast<Evas_Object*>(data);
-
-    if (elm_object_focus_get(layout)) {
-        if (elm_entry_is_empty(obj))
-            elm_object_signal_emit(layout, "elm,state,eraser,hide", "elm");
-        else
-            elm_object_signal_emit(layout, "elm,state,eraser,show", "elm");
-    }
-}
-
-static void _focused_cb(void* data, Evas_Object* obj, void* eventInfo)
-{
-    Evas_Object* layout = static_cast<Evas_Object*>(data);
-
-    if (!elm_entry_is_empty(obj))
-        elm_object_signal_emit(layout, "elm,state,eraser,show", "elm");
-}
-
-static void _unfocused_cb(void* data, Evas_Object* obj, void* eventInfo)
-{
-    Evas_Object* layout = static_cast<Evas_Object*>(data);
-    elm_object_signal_emit(layout, "elm,state,eraser,hide", "elm");
-}
-
-void InputPicker::showDataList(Ewk_Input_Type inputType, Eina_List* optionList)
-{
-    Evas_Object* parent = elm_object_parent_widget_get(m_ewkView);
-    Evas_Object* win = parent;
-
-    m_dataList = optionList;
-
-    if (m_pickerLayout)
-        return;
-
-    m_pickerLayout = new Input_Picker_Layout(m_ewkView);
-
-    /* FIXME: If the entry is in the popup, the parent should be naviframe for uifw limitation. */
-    Evas_Object* naviframe = elm_naviframe_add(m_ewkView);
-    while (parent) {
-        const char* type = elm_object_widget_type_get(parent);
-        if (type) {
-            if (!strcmp(type, elm_object_widget_type_get(naviframe))) {
-                win =  parent;
-                break;
-            }
-        }
-        parent = elm_object_parent_widget_get(parent);
-    }
-
-    evas_object_del(naviframe);
-
-    if (!win)
-        win = m_ewkView;
-
-    m_pickerLayout->popup = elm_popup_add(win);
-    elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select data list");
-
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    if (EflAssistHandle) {
-        void (*webkit_ea_object_event_callback_add)(Evas_Object *, Ea_Callback_Type , Ea_Event_Cb func, void *);
-        webkit_ea_object_event_callback_add = (void (*)(Evas_Object *, Ea_Callback_Type , Ea_Event_Cb func, void *))dlsym(EflAssistHandle, "ea_object_event_callback_add");
-        (*webkit_ea_object_event_callback_add)(m_pickerLayout->popup, EA_CALLBACK_BACK, _data_list_popup_response_cancel_cb, this);
-    }
-#endif
-
-    m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
-    elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","data_list_picker");
-    evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show(m_pickerLayout->layout);
-    elm_object_content_set(m_pickerLayout->popup, m_pickerLayout->layout);
-
-    Evas_Object* elmList = elm_list_add(m_pickerLayout->layout);
-    Eina_List* list = 0;
-    void* listItem = 0;
-    EINA_LIST_FOREACH(optionList, list, listItem) {
-        if (listItem)
-            elm_list_item_append(elmList, static_cast<char*>(listItem), 0, 0, _data_list_selected_cb, this);
-    }
-    evas_object_size_hint_weight_set(elmList, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show(elmList);
-    elm_object_part_content_set(m_pickerLayout->layout, "data_list", elmList);
-
-    Evas_Object* editFieldLayout = elm_layout_add(m_pickerLayout->layout);
-    elm_layout_theme_set(editFieldLayout, "layout", "editfield", "default");
-
-    m_pickerLayout->dataListEditField = elm_entry_add(editFieldLayout);
-    elm_object_part_content_set(editFieldLayout, "elm.swallow.content", m_pickerLayout->dataListEditField);
-
-    elm_object_signal_emit(editFieldLayout, "elm,state,guidetext,hide", "elm");
-    elm_object_signal_callback_add(editFieldLayout, "elm,eraser,clicked", "elm", _eraser_clicked_cb, m_pickerLayout->dataListEditField);
-    evas_object_smart_callback_add(m_pickerLayout->dataListEditField, "changed", _changed_cb, editFieldLayout);
-    evas_object_smart_callback_add(m_pickerLayout->dataListEditField, "focused", _focused_cb, editFieldLayout);
-    evas_object_smart_callback_add(m_pickerLayout->dataListEditField, "unfocused", _unfocused_cb, editFieldLayout);
-
-    elm_object_part_content_set(m_pickerLayout->layout, "selected_item", editFieldLayout);
-    evas_object_show(editFieldLayout);
-
-    m_pickerLayout->okButton = elm_button_add(m_pickerLayout->popup);
-    elm_object_style_set(m_pickerLayout->okButton, "popup");
-    elm_object_text_set(m_pickerLayout->okButton, "OK");
-    elm_object_part_content_set(m_pickerLayout->popup, "button1", m_pickerLayout->okButton);
-    evas_object_smart_callback_add(m_pickerLayout->okButton, "clicked", _data_list_popup_response_cb, this);
-    evas_object_show(m_pickerLayout->popup);
-    evas_object_focus_set(m_pickerLayout->okButton, true);
-
-    Evas_Object* cancelButton = elm_button_add(m_pickerLayout->popup);
-    elm_object_style_set(cancelButton, "popup");
-    elm_object_text_set(cancelButton, "Cancel");
-    elm_object_part_content_set(m_pickerLayout->popup, "button2", cancelButton);
-    evas_object_smart_callback_add(cancelButton, "clicked", _data_list_popup_response_cancel_cb, this);
-    evas_object_show(cancelButton);
-}
-
-void InputPicker::hideDataList(Ewk_Input_Type inputType)
-{
-    if (!m_dataList)
-        return;
-
-    if(m_pickerLayout->popup){
-        evas_object_del(m_pickerLayout->popup);
-        m_pickerLayout->popup = 0;
-    }
-
-    delete m_pickerLayout;
-    m_pickerLayout = 0;
-
-    m_dataList = 0;
-}
-#endif
-
 #if ENABLE(TIZEN_INPUT_COLOR_PICKER)
 void InputPicker::showColorPicker(int r, int g, int b, int)
 {
index fed7484..6825f83 100644 (file)
@@ -68,11 +68,6 @@ public:
 
     void show(Ewk_Input_Type, const char*);
 
-#if ENABLE(TIZEN_DATALIST_ELEMENT)
-    void showDataList(Ewk_Input_Type inputType, Eina_List* optionList);
-    void hideDataList(Ewk_Input_Type inputType);
-#endif
-
 #if ENABLE(TIZEN_INPUT_COLOR_PICKER)
     void showColorPicker(int, int, int, int);
     void hideColorPicker();
index 563d6e2..48c960e 100755 (executable)
@@ -713,29 +713,6 @@ void InputMethodContextEfl::showIMFContext(const EditorState& editor, bool isUse
 
         return;
     }
-
-#if !ENABLE(TIZEN_DATALIST_ELEMENT)
-    Vector<String> optionList = m_viewImpl->page()->getFocusedInputElementDataList();
-    if (optionList.size() > 0) {
-        if (editor.selectionIsRange || !evas_object_focus_get(m_viewImpl->view()))
-            return;
-
-        if (editor.inputMethodHints == "tel")
-            ewkViewDataListShowRequest(m_viewImpl->view(), EWK_INPUT_TYPE_TELEPHONE, optionList);
-        else if (editor.inputMethodHints == "number")
-            ewkViewDataListShowRequest(m_viewImpl->view(), EWK_INPUT_TYPE_NUMBER, optionList);
-        else if (editor.inputMethodHints == "email")
-            ewkViewDataListShowRequest(m_viewImpl->view(), EWK_INPUT_TYPE_EMAIL, optionList);
-        else if (editor.inputMethodHints == "url")
-            ewkViewDataListShowRequest(m_viewImpl->view(), EWK_INPUT_TYPE_URL, optionList);
-        else
-            ewkViewDataListShowRequest(m_viewImpl->view(), EWK_INPUT_TYPE_TEXT, optionList);
-
-        m_contextID = editor.inputMethodContextID;
-
-        return;
-    }
-#endif
 #endif // ENABLE(TIZEN_INPUT_TAG_EXTENSION)
 
     bool hasFocus = evas_object_focus_get(m_viewImpl->view());