Title: [115348] trunk
Revision
115348
Author
[email protected]
Date
2012-04-26 13:15:17 -0700 (Thu, 26 Apr 2012)

Log Message

[BlackBerry] properly disable DRAG_SUPPORT
https://bugs.webkit.org/show_bug.cgi?id=84952

Reviewed by Daniel Bates.
Patch by Antonio Gomes <[email protected]>

.:

Add CMake build options to toggle DRAG_SUPPORT on/off,
and set its value for BlackBerry port.

* Source/cmake/OptionsBlackBerry.cmake: Set it OFF by default.
* Source/cmake/OptionsEFL.cmake: Set it ON by default.
* Source/cmake/OptionsWinCE.cmake: Set it OFF by default.
* Source/cmake/OptionsWindows.cmake: Set it ON by default.
* Source/cmakeconfig.h.cmake:

Source/WTF:

* wtf/Platform.h: Remove the line that disables drag support from here.

Modified Paths

Diff

Modified: trunk/ChangeLog (115347 => 115348)


--- trunk/ChangeLog	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/ChangeLog	2012-04-26 20:15:17 UTC (rev 115348)
@@ -1,5 +1,21 @@
 2012-04-26  Antonio Gomes  <[email protected]>
 
+        [BlackBerry] properly disable DRAG_SUPPORT
+        https://bugs.webkit.org/show_bug.cgi?id=84952
+
+        Reviewed by Daniel Bates.
+
+        Add CMake build options to toggle DRAG_SUPPORT on/off,
+        and set its value for BlackBerry port.
+
+        * Source/cmake/OptionsBlackBerry.cmake: Toggled in ON.
+        * Source/cmake/OptionsBlackBerry.cmake: Toggled OFF.
+        * Source/cmake/OptionsWinCE.cmake: Toggled it OFF.
+        * Source/cmake/OptionsWindows.cmake: Toggled it ON.
+        * Source/cmakeconfig.h.cmake:
+
+2012-04-26  Antonio Gomes  <[email protected]>
+
         [BlackBerry] Add smooth_scrolling options to CMAKE and enable it for Blackberry
         https://bugs.webkit.org/show_bug.cgi?id=84954
 

Modified: trunk/Source/WTF/ChangeLog (115347 => 115348)


--- trunk/Source/WTF/ChangeLog	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/WTF/ChangeLog	2012-04-26 20:15:17 UTC (rev 115348)
@@ -1,3 +1,13 @@
+2012-04-26  Antonio Gomes  <[email protected]>
+
+        [BlackBerry] properly disable DRAG_SUPPORT
+        https://bugs.webkit.org/show_bug.cgi?id=84952
+
+        Reviewed by Daniel Bates.
+
+        * wtf/Platform.h: Remove the line that disables drag support from here
+        for the BlackBerry port.
+
 2012-04-25  Benjamin Poulain  <[email protected]>
 
         Add a version of StringImpl::find() without offset

Modified: trunk/Source/WTF/wtf/Platform.h (115347 => 115348)


--- trunk/Source/WTF/wtf/Platform.h	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/WTF/wtf/Platform.h	2012-04-26 20:15:17 UTC (rev 115348)
@@ -479,7 +479,6 @@
 #endif
 
 #if PLATFORM(BLACKBERRY)
-#define ENABLE_DRAG_SUPPORT 0
 #define USE_SYSTEM_MALLOC 1
 #define WTF_USE_MERSENNE_TWISTER_19937 1
 #define WTF_USE_SKIA 1

Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (115347 => 115348)


--- trunk/Source/cmake/OptionsBlackBerry.cmake	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake	2012-04-26 20:15:17 UTC (rev 115348)
@@ -134,6 +134,7 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILE_SYSTEM ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)

Modified: trunk/Source/cmake/OptionsEfl.cmake (115347 => 115348)


--- trunk/Source/cmake/OptionsEfl.cmake	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/cmake/OptionsEfl.cmake	2012-04-26 20:15:17 UTC (rev 115348)
@@ -66,6 +66,7 @@
 
 WEBKIT_OPTION_BEGIN()
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_MOBILE_SCROLLING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GLIB_SUPPORT ON)

Modified: trunk/Source/cmake/OptionsWinCE.cmake (115347 => 115348)


--- trunk/Source/cmake/OptionsWinCE.cmake	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/cmake/OptionsWinCE.cmake	2012-04-26 20:15:17 UTC (rev 115348)
@@ -19,6 +19,7 @@
 ADD_SUBDIRECTORY(${3RDPARTY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/3rdparty")
 
 WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)

Modified: trunk/Source/cmake/OptionsWindows.cmake (115347 => 115348)


--- trunk/Source/cmake/OptionsWindows.cmake	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/cmake/OptionsWindows.cmake	2012-04-26 20:15:17 UTC (rev 115348)
@@ -16,3 +16,7 @@
 ENDIF ()
 
 STRING(REPLACE "/ENTRY:mainACRTStartup" "/ENTRY:WinMainCRTStartup" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+
+WEBKIT_OPTION_BEGIN()
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
+WEBKIT_OPTION_END()

Modified: trunk/Source/cmakeconfig.h.cmake (115347 => 115348)


--- trunk/Source/cmakeconfig.h.cmake	2012-04-26 20:15:07 UTC (rev 115347)
+++ trunk/Source/cmakeconfig.h.cmake	2012-04-26 20:15:17 UTC (rev 115348)
@@ -18,6 +18,7 @@
 #cmakedefine01 ENABLE_DETAILS
 #cmakedefine01 ENABLE_DEVICE_ORIENTATION
 #cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
+#cmakedefine01 ENABLE_DRAG_SUPPORT
 #cmakedefine01 ENABLE_DRT
 #cmakedefine01 ENABLE_EVENT_MODE_METATAGS
 #cmakedefine01 ENABLE_FAST_MOBILE_SCROLLING
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to