Changeset 150460 in webkit


Ignore:
Timestamp:
May 21, 2013 11:49:40 AM (11 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Add support for building WebKit2
https://bugs.webkit.org/show_bug.cgi?id=116372

Reviewed by Gustavo Noronha Silva.

.:

  • Source/cmake/FindWebP.cmake: Added.
  • Source/cmake/OptionsGTK.cmake: Turn on WebKit2 and the plugin process and also look

for WebP. These missing symbols were hidden up until now. ENABLE_TEXTURE_MAPPER was
also incorrect specified.

Source/WebCore:

  • PlatformGTK.cmake: Add missing source files, include directories, and WebP properties.

Source/WebKit2:

  • CMakeLists.txt: Add common directories to the common include list and remove UIProcess/PageViewportController.cpp

from the source list since it should only be compiled for WebKitEFL. Instead of taking explicit forwarding-header
dependencies accept a list of "tacked-on" dependencies for WebKit2. This allows GTK+ to specify its extra fake
installed header step.

  • PlatformEfl.cmake: Remove common include directories and add UIProcess/PageViewportController.cpp to the source

list. Fix up forwarding header dependencies now.

  • PlatformGTK.cmake: Added.
  • config.h: First check whether this is a CMake build and then fall back to the autotools header.

Tools:

  • CMakeLists.txt: Do not build WebKitTestRunner yet for WebKitGTK+.
  • MiniBrowser/gtk/CMakeLists.txt: Added.
Location:
trunk
Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r150445 r150460  
     12013-05-21  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=116372
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/cmake/FindWebP.cmake: Added.
     9        * Source/cmake/OptionsGTK.cmake: Turn on WebKit2 and the plugin process and also look
     10        for WebP. These missing symbols were hidden up until now. ENABLE_TEXTURE_MAPPER was
     11        also incorrect specified.
     12
    1132013-05-21  Zan Dobersek  <zdobersek@igalia.com>
    214
  • trunk/Source/WebCore/ChangeLog

    r150454 r150460  
     12013-05-21  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=116372
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Add missing source files, include directories, and WebP properties.
     9
    1102013-05-21  Jer Noble  <jer.noble@apple.com>
    211
  • trunk/Source/WebCore/PlatformGTK.cmake

    r150189 r150460  
    66    "${WEBCORE_DIR}/platform/gtk"
    77    "${WEBCORE_DIR}/platform/graphics/cairo"
     8    "${WEBCORE_DIR}/platform/graphics/egl"
     9    "${WEBCORE_DIR}/platform/graphics/glx"
    810    "${WEBCORE_DIR}/platform/graphics/gtk"
    911    "${WEBCORE_DIR}/platform/graphics/freetype"
     
    115117    platform/graphics/cairo/FontCairo.cpp
    116118    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
     119    platform/graphics/cairo/GLContext.cpp
    117120    platform/graphics/cairo/GradientCairo.cpp
    118121    platform/graphics/cairo/GraphicsContext3DCairo.cpp
     
    131134    platform/graphics/cairo/TiledBackingStoreBackendCairo.cpp
    132135    platform/graphics/cairo/TransformationMatrixCairo.cpp
     136
     137    platform/graphics/egl/GLContextEGL.cpp
     138
     139    platform/graphics/glx/GLContextGLX.cpp
    133140
    134141    platform/graphics/gtk/ColorGtk.cpp
     
    248255    ${ZLIB_LIBRARIES}
    249256    ${HARFBUZZ_LIBRARIES}
     257    ${WEBP_LIBRARIES}
    250258    ${XT_LIBRARIES}
    251259    ${X11_X11_LIB}
     
    270278    ${ZLIB_INCLUDE_DIRS}
    271279    ${HARFBUZZ_INCLUDE_DIRS}
     280    ${WEBP_INCLUDE_DIRS}
    272281    ${XT_INCLUDE_DIRS}
    273282)
  • trunk/Source/WebKit2/CMakeLists.txt

    r150336 r150460  
    11set(WebKit2_INCLUDE_DIRECTORIES
     2    "${JAVASCRIPTCORE_DIR}/llint"
    23    "${WEBKIT2_DIR}"
    34    "${WEBKIT2_DIR}/Platform"
     
    9697    "${WEBCORE_DIR}/storage"
    9798    "${WEBCORE_DIR}/svg"
     99    "${WEBCORE_DIR}/svg/graphics"
    98100    "${WEBCORE_DIR}/svg/properties"
    99101    "${JAVASCRIPTCORE_DIR}"
     
    120122    "${CMAKE_SOURCE_DIR}/Source"
    121123)
     124
     125if (WTF_USE_3D_GRAPHICS)
     126    list(APPEND WebKit2_INCLUDE_DIRECTORIES
     127        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     128        "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
     129    )
     130endif ()
    122131
    123132set(WebKit2_SOURCES
     
    246255    UIProcess/GeolocationPermissionRequestProxy.cpp
    247256
    248     UIProcess/PageViewportController.cpp
    249257    UIProcess/ResponsivenessTimer.cpp
    250258    UIProcess/StatisticsRequest.cpp
     
    624632
    625633add_dependencies(WebKit2 WebCore)
    626 add_dependencies(WebKit2 ${ForwardingHeaders_NAME})
    627 add_dependencies(WebKit2 ${ForwardingNetworkHeaders_NAME})
     634add_dependencies(WebKit2 WEBKIT2_EXTRA_DEPENDENCIES)
    628635target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
    629636set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
  • trunk/Source/WebKit2/ChangeLog

    r150445 r150460  
     12013-05-21  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=116372
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Add common directories to the common include list and remove UIProcess/PageViewportController.cpp
     9        from the source list since it should only be compiled for WebKitEFL. Instead of taking explicit forwarding-header
     10        dependencies accept a list of "tacked-on" dependencies for WebKit2. This allows GTK+ to specify its extra fake
     11        installed header step.
     12        * PlatformEfl.cmake: Remove common include directories and add UIProcess/PageViewportController.cpp to the source
     13        list. Fix up forwarding header dependencies now.
     14        * PlatformGTK.cmake: Added.
     15        * config.h: First check whether this is a CMake build and then fall back to the autotools header.
     16
    1172013-05-21  Zan Dobersek  <zdobersek@igalia.com>
    218
  • trunk/Source/WebKit2/PlatformEfl.cmake

    r150336 r150460  
    4242
    4343    UIProcess/DefaultUndoController.cpp
     44    UIProcess/PageViewportController.cpp
    4445
    4546    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
     
    178179
    179180list(APPEND WebKit2_INCLUDE_DIRECTORIES
    180     "${JAVASCRIPTCORE_DIR}/llint"
    181181    "${WEBCORE_DIR}/platform/efl"
    182182    "${WEBCORE_DIR}/platform/graphics/cairo"
    183183    "${WEBCORE_DIR}/platform/network/soup"
    184184    "${WEBCORE_DIR}/platform/text/enchant"
    185     "${WEBCORE_DIR}/svg/graphics"
    186185    "${WEBKIT2_DIR}/Shared/API/c/efl"
    187186    "${WEBKIT2_DIR}/Shared/Downloads/soup"
     
    223222)
    224223
    225 if (WTF_USE_3D_GRAPHICS)
    226     list(APPEND WebKit2_INCLUDE_DIRECTORIES
    227         "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    228         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
    229     )
    230 endif ()
    231 
    232224list(APPEND WebKit2_LIBRARIES
    233225    ${CAIRO_LIBRARIES}
     
    296288    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include CoordinatedGraphics
    297289)
    298 set(ForwardingHeaders_NAME forwarding-headerEfl)
    299290
    300291add_custom_target(forwarding-headerSoup
    301292    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    302293)
    303 set(ForwardingNetworkHeaders_NAME forwarding-headerSoup)
     294
     295set(WEBKIT2_EXTRA_DEPENDENCIES
     296     forwarding-headerEfl
     297     forwarding-headerSoup
     298)
    304299
    305300configure_file(efl/ewebkit2.pc.in ${CMAKE_BINARY_DIR}/WebKit2/efl/ewebkit2.pc @ONLY)
  • trunk/Source/WebKit2/config.h

    r147795 r150460  
    2525 */
    2626
    27 #if defined (BUILDING_GTK__)
     27#if defined(BUILDING_WITH_CMAKE)
     28#include "cmakeconfig.h"
     29#elif defined(BUILDING_GTK__)
    2830#include "autotoolsconfig.h"
    29 #endif /* defined (BUILDING_GTK__) */
    30 
    31 #if defined (BUILDING_WITH_CMAKE)
    32 #include "cmakeconfig.h"
    3331#endif
    3432
  • trunk/Source/cmake/OptionsGTK.cmake

    r150336 r150460  
    7272set(ENABLE_WEBCORE ON)
    7373set(ENABLE_INSPECTOR ON)
    74 set(ENABLE_PLUGIN_PROCESS OFF)
     74set(ENABLE_PLUGIN_PROCESS ON)
    7575set(ENABLE_WEBKIT OFF)
    76 set(ENABLE_WEBKIT2 OFF)
     76set(ENABLE_WEBKIT2 ON)
    7777
    7878set(WTF_USE_ICU_UNICODE 1)
     
    119119find_package(Xt REQUIRED)
    120120find_package(ATK REQUIRED)
     121find_package(WebP REQUIRED)
    121122find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
    122123
     
    143144if (${OPENGL_FOUND} AND (${GLX_FOUND} OR ${EGL_FOUND}))
    144145    set(ENABLE_WEBGL 1)
    145     set(WTF_USE_TEXTURE_MAPPER 1)
     146    set(ENABLE_TEXTURE_MAPPER 1)
    146147    set(WTF_USE_3D_GRAPHICS 1)
    147148
  • trunk/Tools/CMakeLists.txt

    r138158 r150460  
    1 if (ENABLE_WEBKIT2)
     1if (ENABLE_WEBKIT2 AND NOT("${PORT}" STREQUAL "GTK"))
    22    add_subdirectory(WebKitTestRunner)
    33endif ()
     
    1616    endif ()
    1717    add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
     18elseif ("${PORT}" STREQUAL "GTK")
     19    if (ENABLE_WEBKIT2)
     20        add_subdirectory(MiniBrowser/gtk)
     21    endif ()
    1822elseif ("${PORT}" STREQUAL "WinCE")
    1923    add_subdirectory(WinCELauncher)
  • trunk/Tools/ChangeLog

    r150457 r150460  
     12013-05-21  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=116372
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Do not build WebKitTestRunner yet for WebKitGTK+.
     9        * MiniBrowser/gtk/CMakeLists.txt: Added.
     10
    1112013-05-21  Jessie Berlin  <jberlin@apple.com>
    212
Note: See TracChangeset for help on using the changeset viewer.