[WinCairo] Fix forwarding header conflict of WebKit on WinCairo
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2018 11:37:12 +0000 (11:37 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2018 11:37:12 +0000 (11:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177202

Patch by Basuke Suzuki <Basuke.Suzuki@sony.com> on 2018-01-30
Reviewed by Alex Christensen.

.:

* Source/cmake/WebKitMacros.cmake:

Source/WebCore:

* PlatformWin.cmake:

Source/WebKit:

* PlatformWin.cmake:

Tools:

* CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227778 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Tools/CMakeLists.txt
Tools/ChangeLog

index 196878d..e0c4947 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-30  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Fix forwarding header conflict of WebKit on WinCairo
+        https://bugs.webkit.org/show_bug.cgi?id=177202
+
+        Reviewed by Alex Christensen.
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2018-01-29  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthN] Add a compile-time feature flag
index e6caf48..b978913 100644 (file)
@@ -1,3 +1,12 @@
+2018-01-30  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Fix forwarding header conflict of WebKit on WinCairo
+        https://bugs.webkit.org/show_bug.cgi?id=177202
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2018-01-30  Myles C. Maxfield  <mmaxfield@apple.com>
 
         A disallowed user-installed font may be used if its PostScript name is specified
index 40eab89..6a105a4 100644 (file)
@@ -240,6 +240,21 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     workers/service
 )
 
+if (ENABLE_WEBKIT)
+    list(APPEND WebCore_FORWARDING_HEADERS_DIRECTORIES
+        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"
index bc1c290..b1edc48 100644 (file)
@@ -1,3 +1,12 @@
+2018-01-30  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Fix forwarding header conflict of WebKit on WinCairo
+        https://bugs.webkit.org/show_bug.cgi?id=177202
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2018-01-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: evaluateJavaScriptFunction should return null when return value is undefined
index f8800ae..2bb0ef3 100644 (file)
@@ -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
@@ -43,7 +28,6 @@ list(APPEND WebKit_SOURCES
     WebProcess/Plugins/Netscape/win/PluginProxyWin.cpp
 
     WebProcess/WebCoreSupport/win/WebContextMenuClientWin.cpp
-    WebProcess/WebCoreSupport/win/WebFrameNetworkingContext.cpp
     WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
 
     WebProcess/WebPage/AcceleratedDrawingArea.cpp
@@ -122,6 +106,29 @@ endif ()
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1)
 
+    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
@@ -133,17 +140,29 @@ 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_MAKE_FORWARDING_HEADERS(WebKit DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES})
index d2bd952..2ded02f 100644 (file)
@@ -36,11 +36,10 @@ elseif ("${PORT}" STREQUAL "Win")
     add_subdirectory(DumpRenderTree)
     add_subdirectory(ImageDiff)
     if (ENABLE_WEBKIT_LEGACY)
-        add_subdirectory(TestWebKitAPI)
         add_subdirectory(MiniBrowser/win)
     endif ()
 endif ()
 
-if (ENABLE_WEBKIT AND ENABLE_API_TESTS)
+if (ENABLE_API_TESTS)
     add_subdirectory(TestWebKitAPI)
 endif ()
index 6ee07a6..0a32335 100644 (file)
@@ -1,3 +1,12 @@
+2018-01-30  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [WinCairo] Fix forwarding header conflict of WebKit on WinCairo
+        https://bugs.webkit.org/show_bug.cgi?id=177202
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2018-01-29  Alex Christensen  <achristensen@webkit.org>
 
         Clean up API after bugs 178240 and 176474