Revert "Add support for HW more/back keys on input pickers"

This reverts commit 84c2568e22af6094af15a045a9cbb7c0b180ed7e.

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 19de3f2..10db9d4 100755 (executable)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -817,9 +817,6 @@ com) : Patch to do not adjust cover rect as fixed pixel size*/
 #if ENABLE(WORKERS)
 #define ENABLE_TIZEN_WORKERS 1 /* Jihye Kang(jye.kang@samsung.com) : Use allowUniversalAccessFromFileURLs setting for workers */
 #endif
-
-#define ENABLE_TIZEN_HW_MORE_BACK_KEY 1 /* Kwangyong Choi (ky0.choi@samsung.net) : Add support for HW more/back keys */
-
 #endif /* OS(TIZEN) */
 
 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 

diff --git a/Source/WebKit2/PlatformTizen.cmake b/Source/WebKit2/PlatformTizen.cmake
index 86d4c69..35daa64 100755 (executable)
--- a/Source/WebKit2/PlatformTizen.cmake
+++ b/Source/WebKit2/PlatformTizen.cmake
@@ -31,7 +31,6 @@ LIST(APPEND WebKit2StaticForDebug_INCLUDE_DIRECTORIES
     ${TTS_INCLUDE_DIRS}
     ${Tizen-Location-Manager_INCLUDE_DIRS}
     ${UIGadget_INCLUDE_DIRS}
-    ${EFL_ASSIST_INCLUDE_DIRS}
 )
 
 LIST(APPEND WebKit2_LIBRARIES
@@ -40,7 +39,6 @@ LIST(APPEND WebKit2_LIBRARIES
     ${TTS_LIBRARIES}
     ${Tizen-Location-Manager_LIBRARIES}
     ${UIGadget_LIBRARY}
-    ${EFL_ASSIST_LIBRARIES}
 )
 
 ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=0)

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.cpp
index 6405fdd..a848788 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.cpp
@@ -28,9 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-#include <efl_assist.h>
-#endif
 
 #if OS(TIZEN) && ENABLE(TIZEN_INPUT_TAG_EXTENSION)
 
@@ -43,11 +40,6 @@ Input_Picker_Layout::Input_Picker_Layout(Evas_Object* ewkView)
     , colorRect(0)
     , okButton(0)
     , dataListEditField(0)
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    , initial_r(0)
-    , initial_g(0)
-    , initial_b(0)
-#endif
     , datetimeLocal(false)
 {
     evas_object_focus_set(m_ewkView, false);
@@ -227,10 +219,6 @@ void InputPicker::showDataList(Ewk_Input_Type inputType, Eina_List* optionList)
     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)
-    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);
@@ -370,13 +358,6 @@ void InputPicker::ewk_color_popup(int r, int g, int b)
     m_pickerLayout->popup = elm_popup_add(win);
     elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select color");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    m_pickerLayout->initial_r = r;
-    m_pickerLayout->initial_g = g;
-    m_pickerLayout->initial_b = b;
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _color_back_cb, this);
-#endif
-
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","color_picker");
     evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -387,6 +368,8 @@ void InputPicker::ewk_color_popup(int r, int g, int b)
     evas_object_size_hint_weight_set(m_pickerLayout->colorRect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_show(m_pickerLayout->colorRect);
 
+    printf("\n<<<<<<<< r = [%d], g = [%d], b = [%d] >>>>>>>>>>\n", r, g, b);
+
     evas_object_color_set(m_pickerLayout->colorRect, r, g, b, 255);
     elm_object_part_content_set(m_pickerLayout->layout, "elm.swallow.color_rect", m_pickerLayout->colorRect);
 #if ENABLE(ELM_COLORPALLETE)
@@ -536,21 +519,6 @@ void InputPicker::_color_popup_response_cb(void* data,  Evas_Object* obj, void*
     inputPicker->hideColorPicker();
 }
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-void InputPicker::_color_back_cb(void* data,  Evas_Object* obj, void* event_info)
-{
-    InputPicker* inputPicker = static_cast<InputPicker*>(data);
-
-    int r = inputPicker->m_pickerLayout->initial_r;
-    int g = inputPicker->m_pickerLayout->initial_g;
-    int b = inputPicker->m_pickerLayout->initial_b;
-    int a = 255;
-    ewk_view_color_picker_color_set(inputPicker->m_ewkView, r, g, b, a);
-
-    inputPicker->hideColorPicker();
-}
-#endif
-
 void InputPicker::ewk_date_popup(const char* inputValue)
 {
     struct tm* currentTime;
@@ -605,10 +573,6 @@ void InputPicker::ewk_date_popup(const char* inputValue)
     m_pickerLayout->popup = elm_popup_add(win);
     elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select date");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _popup_back_cb, this);
-#endif
-
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","elm/datepicker");
     evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -800,10 +764,6 @@ void InputPicker::ewk_week_popup(const char* inputValue)
     m_pickerLayout->popup = elm_popup_add(win);
     elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select date");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _popup_back_cb, this);
-#endif
-
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","elm/datepicker");
     evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -878,10 +838,6 @@ void InputPicker::ewk_time_popup(const char* inputValue)
     m_pickerLayout->popup = elm_popup_add(win);
     elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select time");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _popup_back_cb, this);
-#endif
-
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","elm/datepicker");
     evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -955,11 +911,8 @@ void InputPicker::ewk_month_popup(const char* inputValue)
         win = m_ewkView;
 
     m_pickerLayout->popup = elm_popup_add(win);
-    elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select month");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _popup_back_cb, this);
-#endif
+    elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select month");
 
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","elm/datepicker");
@@ -1052,10 +1005,6 @@ void InputPicker::ewk_datetime_popup(const char* inputValue, bool local)
     m_pickerLayout->popup = elm_popup_add(win);
     elm_object_part_text_set(m_pickerLayout->popup, "title,text", "Select datetime");
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    ea_object_event_callback_add(m_pickerLayout->popup, EA_CALLBACK_BACK, _popup_back_cb, this);
-#endif
-
     m_pickerLayout->layout = elm_layout_add(m_pickerLayout->popup);
     elm_layout_file_set(m_pickerLayout->layout, EDJE_DIR"/control.edj","datepicker_popup");
     evas_object_size_hint_weight_set(m_pickerLayout->layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1258,24 +1207,6 @@ void InputPicker::_datetime_popup_response_cb(void* data,  Evas_Object* obj, voi
     inputPicker->m_pickerLayout = 0;
 }
 
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-void InputPicker::_popup_back_cb(void* data,  Evas_Object* obj, void* event_info)
-{
-    InputPicker* inputPicker = static_cast<InputPicker*>(data);
-
-    if (!inputPicker->m_pickerLayout)
-        return;
-
-    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;
-}
-#endif
-
 } // namespace WebKit
 
 #endif // OS(TIZEN) && ENABLE(TIZEN_INPUT_TAG_EXTENSION)

diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
index 3865cdc..ec4cb06 100644 (file)
--- a/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
+++ b/Source/WebKit2/UIProcess/API/efl/tizen/InputPicker.h
@@ -58,63 +58,52 @@ public:
     Evas_Object* colorRect;
     Evas_Object* okButton;
     Evas_Object* dataListEditField;
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    int initial_r;
-    int initial_g;
-    int initial_b;
-#endif
     bool datetimeLocal;
 };
 
 namespace WebKit {
 
-class InputPicker {
-public:
-    InputPicker(Evas_Object*);
-    ~InputPicker();
+    class InputPicker {
+    public:
+        InputPicker(Evas_Object*);
+        ~InputPicker();
 
-    void show(Ewk_Input_Type, const char*);
+        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);
+        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();
-    bool isColorPickerShown() { return m_isColorPickerShown; }
+        void showColorPicker(int, int, int, int);
+        void hideColorPicker();
+        bool isColorPickerShown() { return m_isColorPickerShown; }
 #endif
 
-    void ewk_date_popup(const char*);
-    void ewk_time_popup(const char*);
-    void ewk_month_popup(const char*);
-    void ewk_week_popup(const char*);
-    void ewk_datetime_popup(const char*, bool);
-    void ewk_color_popup(int, int, int);
-
-private:
-    static void _date_popup_response_cb(void*, Evas_Object*, void*);
-    static void _time_popup_response_cb(void*, Evas_Object*, void*);
-    static void _month_popup_response_cb(void*, Evas_Object*, void*);
-    static void _week_popup_response_cb(void*, Evas_Object*, void*);
-    static void _datetime_popup_response_cb(void*, Evas_Object*, void*);
-    static void _color_popup_response_cb(void*, Evas_Object*, void*);
-    static void _data_list_popup_response_cb(void*, Evas_Object*, void*);
-    static void _data_list_popup_response_cancel_cb(void*, Evas_Object*, void*);
-    static void _data_list_selected_cb(void*, Evas_Object*, void*);
-    static void _color_selected_cb(void*, Evas*, Evas_Object*, void*);
-
-#if ENABLE(TIZEN_HW_MORE_BACK_KEY)
-    static void _color_back_cb(void*, Evas_Object*, void*);
-    static void _popup_back_cb(void*, Evas_Object*, void*);
-#endif
-
-    Evas_Object* m_ewkView;
-    Input_Picker_Layout* m_pickerLayout;
-    Eina_List* m_dataList;
+        void ewk_date_popup(const char*);
+        void ewk_time_popup(const char*);
+        void ewk_month_popup(const char*);
+        void ewk_week_popup(const char*);
+        void ewk_datetime_popup(const char*, bool);
+        void ewk_color_popup(int, int, int);
+    private:
+        static void _date_popup_response_cb(void*, Evas_Object*, void*);
+        static void _time_popup_response_cb(void*, Evas_Object*, void*);
+        static void _month_popup_response_cb(void*, Evas_Object*, void*);
+        static void _week_popup_response_cb(void*, Evas_Object*, void*);
+        static void _datetime_popup_response_cb(void*, Evas_Object*, void*);
+        static void _color_popup_response_cb(void*, Evas_Object*, void*);
+        static void _data_list_popup_response_cb(void*, Evas_Object*, void*);
+        static void _data_list_popup_response_cancel_cb(void*, Evas_Object*, void*);
+        static void _data_list_selected_cb(void*, Evas_Object*, void*);
+        static void _color_selected_cb(void*, Evas*, Evas_Object*, void*);
+
+        Evas_Object* m_ewkView;
+        Input_Picker_Layout* m_pickerLayout;
+        Eina_List* m_dataList;
 #if ENABLE(TIZEN_INPUT_COLOR_PICKER)
-    bool m_isColorPickerShown;
+        bool m_isColorPickerShown;
 #endif
     };
 } // namespace WebKit

diff --git a/Source/cmake/FindEFL_ASSIST.cmake b/Source/cmake/FindEFL_ASSIST.cmake
deleted file mode 100644 (file)
index 1c86598..0000000
--- a/Source/cmake/FindEFL_ASSIST.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# - Try to find efl-assist
-# Once done, this will define
-#
-#  EFL_ASSIST_FOUND - system has efl-assist
-#  EFL_ASSIST_INCLUDE_DIRS - the efl-assist include directories
-#  EFL_ASSIST_LIBRARIES - link these to use efl-assist
-
-INCLUDE(FindPkgConfig)
-
-PKG_CHECK_MODULES(PC_EFL_ASSIST efl-assist)
-
-FIND_PATH(EFL_ASSIST_INCLUDE_DIRS NAMES efl_assist.h
-  HINTS ${PC_EFL_ASSIST_INCLUDE_DIRS} ${PC_EFL_ASSIST_INCLUDEDIR}
-)
-
-FIND_LIBRARY(EFL_ASSIST_LIBRARIES NAMES efl-assist
-  HINTS ${PC_EFL_ASSIST_LIBRARY_DIRS} ${PC_EFL_ASSIST_LIBDIR}
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EFL_ASSIST DEFAULT_MSG EFL_ASSIST_INCLUDE_DIRS EFL_ASSIST_LIBRARIES)

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 3dfd37e..5f0f972 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -232,7 +232,6 @@ FIND_PACKAGE(Media-Utils 0.1.35 REQUIRED)
 FIND_PACKAGE(UIGadget REQUIRED)
 FIND_PACKAGE(VConf REQUIRED)
 FIND_PACKAGE(feedback REQUIRED)
-FIND_PACKAGE(EFL_ASSIST REQUIRED)
 
 ADD_DEFINITIONS(-DENABLE_GESTURE_EVENTS=1)
 

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index f717178..bddb096 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -21,7 +21,6 @@ BuildRequires: pkgconfig(ecore-file)
 BuildRequires: pkgconfig(edbus)
 BuildRequires: pkgconfig(edje)
 BuildRequires: pkgconfig(eeze)
-BuildRequires: pkgconfig(efl-assist)
 BuildRequires: pkgconfig(eina)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(enchant)