Revert "Revert "Revert "Fix the problem that the screen of the application does not...

[framework/web/webkit-efl.git] / Source / WebKit2 / UIProcess / API / efl / ewk_view.cpp

diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index a09b746..a357e8d 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -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*);
@@ -956,17 +951,8 @@ static void _ewk_view_smart_resize(Evas_Object* ewkView, Evas_Coord width, Evas_
 #if ENABLE(TIZEN_WEBKIT2_TILED_AC)
     evas_object_image_native_surface_set(smartData->image, 0);
 
-#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY)
-    if (impl->pageClient->isVisible()) {
-        Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
-        impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee));
-    } else
-        impl->pageClient->setDeferUpdateViewportSize(true);
-#else
     Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
     impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee));
-#endif
-
 #if ENABLE(TIZEN_RUNTIME_BACKEND_SELECTION)
     if (!ewk_view_is_opengl_backend(ewkView))
         _ewk_view_composite(smartData);
@@ -1036,12 +1022,6 @@ static void _ewk_view_smart_calculate(Evas_Object* ewkView)
 #endif
 #if ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE) && !ENABLE(TIZEN_WEBKIT2_EFL_WTR)
                 Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
-                int newAngle = ecore_evas_rotation_get(ee);
-#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY)
-                if (impl->pageClient->deferUpdateViewportSize()) {
-                    impl->pageClient->updateViewportSize(IntSize(width, height), newAngle);
-                }
-#endif
                 impl->pageClient->updateVisibleContentRectSize(IntSize(width, height));
                 if (ewk_view_is_opengl_backend(ewkView))
                     impl->pageClient->displayViewport();
@@ -1203,10 +1183,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 +1986,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 +4098,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)
@@ -4286,10 +4199,8 @@ void ewk_view_touch_event_handler_result_set(Evas_Object* ewkView, WebKit::WebEv
             evas_object_smart_callback_call(ewkView, "touchmove,handled", static_cast<void*>(&wasHandled));
         impl->wasHandledTouchMove = wasHandled;
     } else if (type == WebEvent::TouchEnd && !impl->exceedTouchMoveThreshold) {
-        if (!wasHandled) {
-            impl->gestureClient->setMovingEnabled(!wasHandled);
+        if (!wasHandled)
             impl->gestureClient->setTapEnabled(!wasHandled);
-        }
 #if ENABLE(TIZEN_ISF_PORT)
         else if (impl->pageProxy->isViewVisible()) {
             IntPoint pointForHitTest = impl->transformFromScene().mapPoint(IntPoint(impl->touchDownPoint.x, impl->touchDownPoint.y));