Disable TIZEN_MULTIPLE_SELECT

This patch allows to render <select> element that has the multiple attribute like desktop browsers.
In addition, TIZEN_DESKTOP_BROWSING is added for desktop browsing support.

Change-Id: I90d4466c814f7bba1c0235169eac613415effab2

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 4711cd2..c55fa9f 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -325,7 +325,11 @@
 
 /* EWK patches */
 #define ENABLE_TIZEN_ISF_PORT 1 /* Michal Pakula(m.pakula@samsung.com) : feature for integrating the EditorClient Port with TIZEN2.0 ISF */
+#if ENABLE(TIZEN_DESKTOP_BROWSING)
+#define ENABLE_TIZEN_MULTIPLE_SELECT 0 /*Santosh Mahto (santosh.ma@samsung.com) : enable the feature of handling select element multple selection */
+#else
 #define ENABLE_TIZEN_MULTIPLE_SELECT 1 /*Santosh Mahto (santosh.ma@samsung.com) : enable the feature of handling select element multple selection */
+#endif
 #define ENABLE_TIZEN_PASTEBOARD 1 /* Michal Pakula(m.pakula@samsung.com), Eunmi Lee(eunmi15.lee@samsung.com) : Pasteboard implementation for WK1 and WK2. */
 #define ENABLE_TIZEN_TEXT_CARET_HANDLING_WK2 1 /* Piotr Roguski(p.roguski@samsung.com) : enables two methods for getting and setting text caret position in editable fields */
 #define ENABLE_TIZEN_ENLARGE_CARET_WIDTH 1 /* Taesik Cho : enlarge default caret width(size) - Email team is demanding this function. When composing, it is difficult to know where caret is.*/

diff --git a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
index 6f4aeb6..1c410a0 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp
@@ -57,7 +57,7 @@
 #include <WebCore/HTMLNames.h>
 #endif
 
-#if ENABLE(TIZEN_MULTIPLE_SELECT)
+#if ENABLE(TIZEN_WEBKIT2_POPUP_INTERNAL)
 #include "WebPopupMenu.h"
 #include <WebCore/PopupMenuClient.h>
 #endif

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 50f12bb..96d646a 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -433,6 +433,10 @@ IF (ENABLE_TIZEN_SCREEN_READER)
     ADD_DEFINITIONS(-DHAVE_ACCESSIBILITY=1)
 ENDIF()
 
+IF (ENABLE_TIZEN_DESKTOP_BROWSING)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_DESKTOP_BROWSING=1)
+ENDIF ()
+
 INCLUDE_IF_EXISTS(${CMAKE_CURRENT_SOURCE_DIR}/Source/cmake/OptionsExperimental.cmake)
 
 MESSAGE("Finish to check Tizen dependencies")

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 39de232..6c54353 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -1,5 +1,6 @@
 %bcond_with mesa
 %bcond_with wayland
+%bcond_with ivi
 Name: webkit2-efl
 Summary: Webkit2 EFL
 Version: 123997_0.11.47
@@ -175,6 +176,9 @@ then
 %if %{with mesa}
         -DUSE_MESA=On \
 %endif
+%if %{with ivi}
+       -DENABLE_TIZEN_DESKTOP_BROWSING=On \
+%endif
         -DCMAKE_CXX_ARCHIVE_APPEND="<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>" \
        -DCMAKE_CXX_ARCHIVE_CREATE="<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>"
     make %{?_smp_mflags}