Attachment 332537 Details for Bug 177202 – [PATCH] To build wincairo webkit

[patch] [PATCH] To build wincairo webkit

bz177202-wip.patch (text/plain), 9.08 KB, created by Yousuke Kimoto on 2018-01-29 06:50:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yousuke Kimoto

Created: 2018-01-29 06:50:57 PST

Size: 9.08 KB

patch

obsolete

>diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
>index 40eab89..51790d0 100644
>--- a/Source/WebCore/PlatformWin.cmake
>+++ b/Source/WebCore/PlatformWin.cmake
>@@ -148,6 +148,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     bindings
>     bridge
>     contentextensions
>+    crypto
>     css
>     dom
>     editing
>@@ -200,7 +201,6 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     loader/cache
>     loader/icon
> 
>-
>     page/animation
>     page/csp
>     page/scrolling
>@@ -240,6 +240,22 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
>     workers/service
> )
> 
>+if (ENABLE_WEBKIT)
>+    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
>+        Modules/applepay
>+        Modules/applicationmanifest
>+
>+        dom/messageports
>+
>+        inspector/agents
>+
>+        platform/mediastream
>+
>+        workers/service/context
>+        workers/service/server
>+    )
>+endif ()
>+
> if (USE_CF)
>     list(APPEND WebCore_INCLUDE_DIRECTORIES
>         "${WEBCORE_DIR}/platform/cf"
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index f8800ae..4ca4432 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -9,15 +9,6 @@ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
> add_definitions(-DBUILDING_WEBKIT)
> 
> list(APPEND WebKit_SOURCES
>-    NetworkProcess/Downloads/curl/DownloadCurl.cpp
>-
>-    NetworkProcess/cache/NetworkCacheCodersCurl.cpp
>-    NetworkProcess/cache/NetworkCacheDataCurl.cpp
>-    NetworkProcess/cache/NetworkCacheIOChannelCurl.cpp
>-
>-    NetworkProcess/curl/NetworkProcessCurl.cpp
>-    NetworkProcess/curl/RemoteNetworkingContextCurl.cpp
>-
>     NetworkProcess/win/NetworkProcessMainWin.cpp
>     NetworkProcess/win/SystemProxyWin.cpp
> 
>@@ -25,17 +16,11 @@ list(APPEND WebKit_SOURCES
>     Platform/win/ModuleWin.cpp
>     Platform/win/SharedMemoryWin.cpp
> 
>-    Shared/Authentication/curl/AuthenticationManagerCurl.cpp
>-
>-    Shared/curl/WebCoreArgumentCodersCurl.cpp
>-
>     Platform/IPC/win/AttachmentWin.cpp
>     Platform/IPC/win/ConnectionWin.cpp
> 
>     StorageProcess/win/StorageProcessMainWin.cpp
> 
>-    WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
>-
>     WebProcess/InjectedBundle/win/InjectedBundleWin.cpp
> 
>     WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
>@@ -120,30 +105,36 @@ if (${ENABLE_PLUGIN_PROCESS})
> endif ()
> 
> if (${WTF_PLATFORM_WIN_CAIRO})
>-    add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
>-
>-    list(APPEND WebKit_LIBRARIES
>-        ${OPENSSL_LIBRARIES}
>-        mfuuid.lib
>-        strmiids.lib
>-    )
>+    include(PlatformWinCairo.cmake)
> endif ()
> 
> set(SharedWebKitLibraries
>     ${WebKit_LIBRARIES}
> )
> 
>-add_custom_target(WebKit-forwarding-headers
>-                  COMMAND ${PERL_EXECUTABLE}
>-                  ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl
>-                  --include-path ${WEBKIT_DIR}
>-                  --output ${FORWARDING_HEADERS_DIR}
>-                  --platform win
>-                  --platform curl
>-                  )
>-
>-set(WEBKIT_EXTRA_DEPENDENCIES
>-    WebKit-forwarding-headers
>+WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
>+
>+set(WebKit_FORWARDING_HEADERS_DIRECTORIES
>+    Platform
>+    Shared
>+    UIProcess
>+
>+    NetworkProcess/Downloads
>+
>+    Platform/IPC
>+
>+    Shared/API
>+
>+    Shared/API/c
>+
>+    Shared/API/c/cf
>+
>+    UIProcess/API/c
>+    UIProcess/API/cpp
>+
>+    WebProcess/WebPage
>+
>+    WebProcess/InectedBundle/API/c
> )
> 
>-WEBKIT_WRAP_SOURCELIST(${WebKit_SOURCES})
>+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES})
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index bead0bf..4d1d1cb 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -53,9 +53,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STATISTICS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS PUBLIC OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA PUBLIC OFF)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index a1e7e8f..66f807b 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -181,38 +181,35 @@ macro(WEBKIT_CREATE_FORWARDING_HEADER _target_directory _file)
> endmacro()
> 
> macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
>-    # On Windows, we copy the entire contents of forwarding headers.
>-    if (NOT WIN32)
>-        set(_processing_directories 0)
>-        set(_processing_files 0)
>-        set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
>-
>-        file(GLOB _files "${_target_directory}/*.h")
>-        foreach (_file ${_files})
>-            file(READ "${_file}" _content)
>-            string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
>-            if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
>-               file(REMOVE "${_file}")
>-            endif ()
>-        endforeach ()
>+    set(_processing_directories 0)
>+    set(_processing_files 0)
>+    set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
>+
>+    file(GLOB _files "${_target_directory}/*.h")
>+    foreach (_file ${_files})
>+        file(READ "${_file}" _content)
>+        string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
>+        if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
>+            file(REMOVE "${_file}")
>+        endif ()
>+    endforeach ()
> 
>-        foreach (_currentArg ${ARGN})
>-            if ("${_currentArg}" STREQUAL "DIRECTORIES")
>-                set(_processing_directories 1)
>-                set(_processing_files 0)
>-            elseif ("${_currentArg}" STREQUAL "FILES")
>-                set(_processing_directories 0)
>-                set(_processing_files 1)
>-            elseif (_processing_directories)
>-                file(GLOB _files "${_currentArg}/*.h")
>-                foreach (_file ${_files})
>-                    WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
>-                endforeach ()
>-            elseif (_processing_files)
>-                WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
>-            endif ()
>-        endforeach ()
>-    endif ()
>+    foreach (_currentArg ${ARGN})
>+        if ("${_currentArg}" STREQUAL "DIRECTORIES")
>+            set(_processing_directories 1)
>+            set(_processing_files 0)
>+        elseif ("${_currentArg}" STREQUAL "FILES")
>+            set(_processing_directories 0)
>+            set(_processing_files 1)
>+        elseif (_processing_directories)
>+            file(GLOB _files "${_currentArg}/*.h")
>+            foreach (_file ${_files})
>+                WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
>+            endforeach ()
>+        elseif (_processing_files)
>+            WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
>+        endif ()
>+    endforeach ()
> endmacro()
> 
> function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
>diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
>index d2bd952..6845966 100644
>--- a/Tools/CMakeLists.txt
>+++ b/Tools/CMakeLists.txt
>@@ -33,10 +33,9 @@ elseif ("${PORT}" STREQUAL "WPE")
>         endif ()
>     endif ()
> elseif ("${PORT}" STREQUAL "Win")
>-    add_subdirectory(DumpRenderTree)
>     add_subdirectory(ImageDiff)
>     if (ENABLE_WEBKIT_LEGACY)
>-        add_subdirectory(TestWebKitAPI)
>+        add_subdirectory(DumpRenderTree)
>         add_subdirectory(MiniBrowser/win)
>     endif ()
> endif ()
>diff --git a/Source/WebKit/PlatformWinCairo.cmake b/Source/WebKit/PlatformWinCairo.cmake
>new file mode 100644
>index 0000000..388aa5a
>--- /dev/null
>+++ b/Source/WebKit/PlatformWinCairo.cmake
>@@ -0,0 +1,40 @@
>+add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
>+
>+list(APPEND WebKit_LIBRARIES
>+    ${OPENSSL_LIBRARIES}
>+    mfuuid.lib
>+    strmiids.lib
>+)
>+
>+list(REMOVE_ITEM WebKit_SOURCES
>+    WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp
>+)
>+
>+list(APPEND WebKit_SOURCES
>+    NetworkProcess/Downloads/curl/DownloadCurl.cpp
>+
>+    NetworkProcess/cache/NetworkCacheCodersCurl.cpp
>+    NetworkProcess/cache/NetworkCacheDataCurl.cpp
>+    NetworkProcess/cache/NetworkCacheIOChannelCurl.cpp
>+
>+    NetworkProcess/curl/NetworkProcessCurl.cpp
>+    NetworkProcess/curl/RemoteNetworkingContextCurl.cpp
>+
>+    Shared/Authentication/curl/AuthenticationManagerCurl.cpp
>+
>+    Shared/curl/WebCoreArgumentCodersCurl.cpp
>+
>+    WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
>+
>+    WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp
>+)
>+
>+list(APPEND WebKit_INCLUDE_DIRECTORIES
>+    "${WEBKIT_DIR}/UIProcess/WebCoreSupport/curl"
>+)
>+
>+list(APPEND WebKit_LIBRARIES
>+    ${OPENSSL_LIBRARIES}
>+    mfuuid.lib
>+    strmiids.lib
>+)

Actions: View | Formatted Diff | Diff

Attachments on bug 177202: 322314 | 332216 | 332218 | 332420 | 332453 | 332459 | 332461 | 332537 | 332558 | 332605