Diff
Modified: trunk/ChangeLog (136883 => 136884)
--- trunk/ChangeLog 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/ChangeLog 2012-12-06 21:58:01 UTC (rev 136884)
@@ -1,3 +1,18 @@
+2012-12-06 Laszlo Gombos <[email protected]>
+
+ [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
+ https://bugs.webkit.org/show_bug.cgi?id=104278
+
+ Reviewed by Brent Fulgham.
+
+ The variable is unnecessary as glib is a required dependency
+ for the EFL port and glib is not used by other ports building
+ with CMake.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2012-12-06 Tony Chang <[email protected]>
REGRESSION(r135082): Restore the ability to insert author level style sheets from script
Modified: trunk/Source/_javascript_Core/ChangeLog (136883 => 136884)
--- trunk/Source/_javascript_Core/ChangeLog 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-12-06 21:58:01 UTC (rev 136884)
@@ -1,3 +1,14 @@
+2012-12-06 Laszlo Gombos <[email protected]>
+
+ [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
+ https://bugs.webkit.org/show_bug.cgi?id=104278
+
+ Reviewed by Brent Fulgham.
+
+ The conditional is not required as it is always set for EFL.
+
+ * PlatformEfl.cmake:
+
2012-12-06 Oliver Hunt <[email protected]>
Build fix, last patch rolled out logic that is now needed on ToT.
Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (136883 => 136884)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2012-12-06 21:58:01 UTC (rev 136884)
@@ -10,11 +10,7 @@
)
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${_javascript_CORE_DIR}/wtf/gobject
${ICU_INCLUDE_DIRS}
)
-if (ENABLE_GLIB_SUPPORT)
- list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
- ${_javascript_CORE_DIR}/wtf/gobject
- )
-endif ()
Modified: trunk/Source/WebKit2/ChangeLog (136883 => 136884)
--- trunk/Source/WebKit2/ChangeLog 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-06 21:58:01 UTC (rev 136884)
@@ -1,3 +1,18 @@
+2012-12-06 Laszlo Gombos <[email protected]>
+
+ [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
+ https://bugs.webkit.org/show_bug.cgi?id=104278
+
+ Reviewed by Brent Fulgham.
+
+ The guards are not required as it is always set for EFL.
+
+ * PlatformEfl.cmake:
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (WebKit::WebProcessMainEfl):
+
2012-12-06 Tony Chang <[email protected]>
REGRESSION(r135082): Restore the ability to insert author level style sheets from script
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (136883 => 136884)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-12-06 21:58:01 UTC (rev 136884)
@@ -329,17 +329,11 @@
${GLIB_LIBRARIES}
${GLIB_GIO_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
${LIBSOUP_LIBRARIES}
gtest
)
-if (ENABLE_GLIB_SUPPORT)
- list(APPEND EWK2UnitTests_LIBRARIES
- ${GLIB_LIBRARIES}
- ${GLIB_GTHREAD_LIBRARIES}
- )
-endif ()
-
set(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests")
set(TEST_RESOURCES_DIR ${WEBKIT2_EFL_TEST_DIR}/resources)
set(TEST_INJECTED_BUNDLE_DIR ${WEBKIT2_EFL_TEST_DIR}/InjectedBundle)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (136883 => 136884)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-12-06 21:58:01 UTC (rev 136884)
@@ -35,7 +35,7 @@
#include <WebCore/FileSystem.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#if PLATFORM(GTK) || PLATFORM(EFL)
#include <glib.h>
#endif
@@ -60,7 +60,7 @@
bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
{
-#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#if PLATFORM(GTK) || PLATFORM(EFL)
CString binaryPath = fileSystemRepresentation(executablePathOfPluginProcess());
CString pluginPathCString = fileSystemRepresentation(pluginPath);
char* argv[4];
@@ -105,9 +105,9 @@
result.description.swap(lines[1]);
result.mimeDescription.swap(lines[2]);
return !result.mimeDescription.isEmpty();
-#else // PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#else // PLATFORM(GTK) || PLATFORM(EFL)
return false;
-#endif // PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
+#endif // PLATFORM(GTK) || PLATFORM(EFL)
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (136883 => 136884)
--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2012-12-06 21:58:01 UTC (rev 136884)
@@ -88,12 +88,10 @@
}
#endif
-#if ENABLE(GLIB_SUPPORT)
g_type_init();
if (!ecore_main_loop_glib_integrate())
return 1;
-#endif
JSC::initializeThreading();
WTF::initializeMainThread();
Modified: trunk/Source/cmake/OptionsEfl.cmake (136883 => 136884)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-12-06 21:58:01 UTC (rev 136884)
@@ -24,6 +24,8 @@
find_package(LibSoup 2.39.4.1 REQUIRED)
set(WTF_USE_SOUP 1)
+
+add_definitions(-DENABLE_GLIB_SUPPORT=1)
add_definitions(-DWTF_USE_SOUP=1)
add_definitions(-DWTF_USE_PTHREADS=1)
add_definitions(-DWTF_USE_ICU_UNICODE=1)
@@ -63,7 +65,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GLIB_SUPPORT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (136883 => 136884)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-12-06 21:58:01 UTC (rev 136884)
@@ -51,7 +51,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_FULLSCREEN_API "Toggle Fullscreen API support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_GEOLOCATION "Toggle Geolocation support" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_GLIB_SUPPORT "Toggle Glib support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING "Toggle hidden page DOM timer throttling support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_HIGH_DPI_CANVAS "Toggle high-DPI canvas backing store support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_ICONDATABASE "Toggle Icon database support" ON)
Modified: trunk/Source/cmakeconfig.h.cmake (136883 => 136884)
--- trunk/Source/cmakeconfig.h.cmake 2012-12-06 21:41:27 UTC (rev 136883)
+++ trunk/Source/cmakeconfig.h.cmake 2012-12-06 21:58:01 UTC (rev 136884)
@@ -45,7 +45,6 @@
#cmakedefine01 ENABLE_FULLSCREEN_API
#cmakedefine01 ENABLE_GAMEPAD
#cmakedefine01 ENABLE_GEOLOCATION
-#cmakedefine01 ENABLE_GLIB_SUPPORT
#cmakedefine01 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING
#cmakedefine01 ENABLE_ICONDATABASE
#cmakedefine01 ENABLE_IFRAME_SEAMLESS
