Changeset 136884 in webkit


Ignore:
Timestamp:
Dec 6, 2012 1:58:01 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
​https://bugs.webkit.org/show_bug.cgi?id=104278

Patch by Laszlo Gombos <​l.gombos@samsung.com> on 2012-12-06
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:

Source/JavaScriptCore:

The conditional is not required as it is always set for EFL.

  • PlatformEfl.cmake:

Source/WebKit2:

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):

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r136878 r136884  
     12012-12-06  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
     4        https://bugs.webkit.org/show_bug.cgi?id=104278
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The variable is unnecessary as glib is a required dependency
     9        for the EFL port and glib is not used by other ports building
     10        with CMake.
     11
     12        * Source/cmake/OptionsEfl.cmake:
     13        * Source/cmake/WebKitFeatures.cmake:
     14        * Source/cmakeconfig.h.cmake:
     15
    1162012-12-06  Tony Chang  <tony@chromium.org>
    217

  • trunk/Source/JavaScriptCore/ChangeLog

    r136863 r136884  
     12012-12-06  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
     4        https://bugs.webkit.org/show_bug.cgi?id=104278
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The conditional is not required as it is always set for EFL.
     9
     10        * PlatformEfl.cmake:
     11
    1122012-12-06  Oliver Hunt  <oliver@apple.com>
    213

  • trunk/Source/JavaScriptCore/PlatformEfl.cmake

    r136790 r136884  
    1111
    1212list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     13    ${JAVASCRIPTCORE_DIR}/wtf/gobject
    1314    ${ICU_INCLUDE_DIRS}
    1415)
    1516
    16 if (ENABLE_GLIB_SUPPORT)
    17     list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
    18          ${JAVASCRIPTCORE_DIR}/wtf/gobject
    19     )
    20 endif ()

  • trunk/Source/WebKit2/ChangeLog

    r136878 r136884  
     12012-12-06  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        [EFL] Remove ENABLE_GLIB_SUPPORT CMake variable
     4        https://bugs.webkit.org/show_bug.cgi?id=104278
     5
     6        Reviewed by Brent Fulgham.
     7
     8        The guards are not required as it is always set for EFL.
     9
     10        * PlatformEfl.cmake:
     11        * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
     12        (WebKit::PluginProcessProxy::scanPlugin):
     13        * WebProcess/efl/WebProcessMainEfl.cpp:
     14        (WebKit::WebProcessMainEfl):
     15
    1162012-12-06  Tony Chang  <tony@chromium.org>
    217

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r136790 r136884  
    330330    ${GLIB_GIO_LIBRARIES}
    331331    ${GLIB_GOBJECT_LIBRARIES}
     332    ${GLIB_GTHREAD_LIBRARIES}
    332333    ${LIBSOUP_LIBRARIES}
    333334    gtest
    334335)
    335 
    336 if (ENABLE_GLIB_SUPPORT)
    337     list(APPEND EWK2UnitTests_LIBRARIES
    338         ${GLIB_LIBRARIES}
    339         ${GLIB_GTHREAD_LIBRARIES}
    340     )
    341 endif ()
    342336
    343337set(WEBKIT2_EFL_TEST_DIR "${WEBKIT2_DIR}/UIProcess/API/efl/tests")

  • trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

    r135845 r136884  
    3636#include <wtf/text/CString.h>
    3737#include <wtf/text/WTFString.h>
    38 #if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
     38#if PLATFORM(GTK) || PLATFORM(EFL)
    3939#include <glib.h>
    4040#endif
    … …  
    6161bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
    6262{
    63 #if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
     63#if PLATFORM(GTK) || PLATFORM(EFL)
    6464    CString binaryPath = fileSystemRepresentation(executablePathOfPluginProcess());
    6565    CString pluginPathCString = fileSystemRepresentation(pluginPath);
    … …  
    106106    result.mimeDescription.swap(lines[2]);
    107107    return !result.mimeDescription.isEmpty();
    108 #else // PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
     108#else // PLATFORM(GTK) || PLATFORM(EFL)
    109109    return false;
    110 #endif // PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(GLIB_SUPPORT))
     110#endif // PLATFORM(GTK) || PLATFORM(EFL)
    111111}
    112112

  • trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp

    r132350 r136884  
    8989#endif
    9090
    91 #if ENABLE(GLIB_SUPPORT)
    9291    g_type_init();
    9392
    9493    if (!ecore_main_loop_glib_integrate())
    9594        return 1;
    96 #endif
    9795
    9896    JSC::initializeThreading();

  • trunk/Source/cmake/OptionsEfl.cmake

    r136854 r136884  
    2525
    2626set(WTF_USE_SOUP 1)
     27
     28add_definitions(-DENABLE_GLIB_SUPPORT=1)
    2729add_definitions(-DWTF_USE_SOUP=1)
    2830add_definitions(-DWTF_USE_PTHREADS=1)
    … …  
    6466WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
    6567WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD ON)
    66 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GLIB_SUPPORT ON)
    6768WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
    6869WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r136790 r136884  
    5252    WEBKIT_OPTION_DEFINE(ENABLE_GAMEPAD "Toggle Gamepad support" OFF)
    5353    WEBKIT_OPTION_DEFINE(ENABLE_GEOLOCATION "Toggle Geolocation support" OFF)
    54     WEBKIT_OPTION_DEFINE(ENABLE_GLIB_SUPPORT "Toggle Glib support" OFF)
    5554    WEBKIT_OPTION_DEFINE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING "Toggle hidden page DOM timer throttling support" OFF)
    5655    WEBKIT_OPTION_DEFINE(ENABLE_HIGH_DPI_CANVAS "Toggle high-DPI canvas backing store support" OFF)

  • trunk/Source/cmakeconfig.h.cmake

    r136204 r136884  
    4646#cmakedefine01 ENABLE_GAMEPAD
    4747#cmakedefine01 ENABLE_GEOLOCATION
    48 #cmakedefine01 ENABLE_GLIB_SUPPORT
    4948#cmakedefine01 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING
    5049#cmakedefine01 ENABLE_ICONDATABASE
Note: See TracChangeset for help on using the changeset viewer.