[WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatfor...
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Oct 2017 18:12:04 +0000 (18:12 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Oct 2017 18:12:04 +0000 (18:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=178964

Reviewed by Carlos Alberto Lopez Perez.

Source/WebCore:

This also gets rid of the WebCorePlatformWPE build target to simplify the build. It links to
all the same libraries as the WebCore target, so it doesn't seem to have any purpose. Bye.

Some CMake files under platform are not unified, either because there is not much to gain
(e.g. ImageDecoders, where everything is in a separate directory), or because it is complex
(e.g. GStreamer, where GObject implementations would be tricky to build unified), and
because we're limited to using only features declared in WebKitFeatures.cmake inside the
unified sources lists, which makes some of the platform files a bit tricky (notably,
anything that needs to go into WebCorePlatformGTK for the GTK port). So it's not perfect.

* PlatformWPE.cmake:
* SourcesWPE.txt: Added.
* crypto/gcrypt/GCryptUtilities.h:
* platform/Cairo.cmake:
* platform/GCrypt.cmake:
* platform/SourcesCairo.txt: Added.
* platform/SourcesGCrypt.txt: Added.
* platform/SourcesGLib.txt: Added.
* platform/SourcesSoup.txt: Added.

Source/WebKit:

* PlatformWPE.cmake:

Tools:

* TestWebKitAPI/PlatformWPE.cmake:

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

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/PlatformWPE.cmake
Source/WebCore/SourcesWPE.txt [new file with mode: 0644]
Source/WebCore/crypto/gcrypt/GCryptUtilities.h
Source/WebCore/platform/Cairo.cmake
Source/WebCore/platform/GCrypt.cmake
Source/WebCore/platform/SourcesCairo.txt [new file with mode: 0644]
Source/WebCore/platform/SourcesGCrypt.txt [new file with mode: 0644]
Source/WebCore/platform/SourcesGLib.txt [new file with mode: 0644]
Source/WebCore/platform/SourcesSoup.txt [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/PlatformWPE.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformWPE.cmake

index ad7b469..b4b8edf 100644 (file)
@@ -1,5 +1,32 @@
 2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
+        https://bugs.webkit.org/show_bug.cgi?id=178964
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        This also gets rid of the WebCorePlatformWPE build target to simplify the build. It links to
+        all the same libraries as the WebCore target, so it doesn't seem to have any purpose. Bye.
+
+        Some CMake files under platform are not unified, either because there is not much to gain
+        (e.g. ImageDecoders, where everything is in a separate directory), or because it is complex
+        (e.g. GStreamer, where GObject implementations would be tricky to build unified), and
+        because we're limited to using only features declared in WebKitFeatures.cmake inside the
+        unified sources lists, which makes some of the platform files a bit tricky (notably,
+        anything that needs to go into WebCorePlatformGTK for the GTK port). So it's not perfect.
+
+        * PlatformWPE.cmake:
+        * SourcesWPE.txt: Added.
+        * crypto/gcrypt/GCryptUtilities.h:
+        * platform/Cairo.cmake:
+        * platform/GCrypt.cmake:
+        * platform/SourcesCairo.txt: Added.
+        * platform/SourcesGCrypt.txt: Added.
+        * platform/SourcesGLib.txt: Added.
+        * platform/SourcesSoup.txt: Added.
+
+2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         Remove more unused ENABLE(GAMEPAD_DEPRECATED) code
         https://bugs.webkit.org/show_bug.cgi?id=178364
 
index 6fe63cd..dcd3072 100644 (file)
@@ -5,6 +5,18 @@ include(platform/GStreamer.cmake)
 include(platform/ImageDecoders.cmake)
 include(platform/TextureMapper.cmake)
 
+list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
+    "SourcesWPE.txt"
+
+    "platform/SourcesGLib.txt"
+    "platform/SourcesSoup.txt"
+)
+
+# FIXME: This can't go into SourcesGLib.txt because it has to go into WebCorePlatformGTK.
+list(APPEND WebCore_SOURCES
+    platform/glib/EventHandlerGLib.cpp
+)
+
 # Allow building ANGLE on platforms that don't provide X11 headers.
 list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
 
@@ -45,116 +57,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${WTF_DIR}
 )
 
-list(APPEND WebCore_SOURCES
-    accessibility/wpe/AXObjectCacheWPE.cpp
-    accessibility/wpe/AccessibilityObjectWPE.cpp
-
-    loader/soup/CachedRawResourceSoup.cpp
-    loader/soup/SubresourceLoaderSoup.cpp
-
-    page/linux/ResourceUsageOverlayLinux.cpp
-    page/linux/ResourceUsageThreadLinux.cpp
-
-    page/scrolling/ScrollingStateStickyNode.cpp
-    page/scrolling/ScrollingThread.cpp
-    page/scrolling/ScrollingTreeNode.cpp
-    page/scrolling/ScrollingTreeScrollingNode.cpp
-
-    page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
-    page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
-
-    platform/Cursor.cpp
-    platform/PlatformStrategies.cpp
-    platform/Theme.cpp
-    platform/UserAgentQuirks.cpp
-
-    platform/audio/glib/AudioBusGLib.cpp
-
-    platform/glib/EventLoopGlib.cpp
-    platform/glib/FileMonitorGLib.cpp
-    platform/glib/FileSystemGlib.cpp
-    platform/glib/KeyedDecoderGlib.cpp
-    platform/glib/KeyedEncoderGlib.cpp
-    platform/glib/LowPowerModeNotifierGLib.cpp
-    platform/glib/MainThreadSharedTimerGLib.cpp
-    platform/glib/SSLKeyGeneratorGLib.cpp
-    platform/glib/SharedBufferGlib.cpp
-    platform/glib/UserAgentGLib.cpp
-
-    platform/graphics/GLContext.cpp
-    platform/graphics/GraphicsContext3DPrivate.cpp
-    platform/graphics/ImageSource.cpp
-    platform/graphics/PlatformDisplay.cpp
-    platform/graphics/WOFFFileFormat.cpp
-
-    platform/graphics/egl/GLContextEGL.cpp
-
-    platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
-    platform/graphics/opengl/Extensions3DOpenGLES.cpp
-    platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
-    platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
-    platform/graphics/opengl/TemporaryOpenGLSetting.cpp
-
-    platform/graphics/opentype/OpenTypeVerticalData.cpp
-
-    platform/graphics/wpe/PlatformDisplayWPE.cpp
-
-    platform/network/glib/NetworkStateNotifierGLib.cpp
-
-    platform/network/soup/AuthenticationChallengeSoup.cpp
-    platform/network/soup/CertificateInfo.cpp
-    platform/network/soup/CookieJarSoup.cpp
-    platform/network/soup/CookieStorageSoup.cpp
-    platform/network/soup/CredentialStorageSoup.cpp
-    platform/network/soup/DNSSoup.cpp
-    platform/network/soup/GRefPtrSoup.cpp
-    platform/network/soup/NetworkStorageSessionSoup.cpp
-    platform/network/soup/ProxyServerSoup.cpp
-    platform/network/soup/ResourceErrorSoup.cpp
-    platform/network/soup/ResourceHandleSoup.cpp
-    platform/network/soup/ResourceRequestSoup.cpp
-    platform/network/soup/ResourceResponseSoup.cpp
-    platform/network/soup/SocketStreamHandleImplSoup.cpp
-    platform/network/soup/SoupNetworkSession.cpp
-    platform/network/soup/SynchronousLoaderClientSoup.cpp
-    platform/network/soup/WebKitSoupRequestGeneric.cpp
-
-    platform/soup/PublicSuffixSoup.cpp
-    platform/soup/SharedBufferSoup.cpp
-    platform/soup/URLSoup.cpp
-
-    platform/text/Hyphenation.cpp
-    platform/text/LocaleICU.cpp
-    platform/text/TextCodecICU.cpp
-    platform/text/TextEncodingDetectorICU.cpp
-
-    platform/unix/LoggingUnix.cpp
-
-    platform/xdg/MIMETypeRegistryXdg.cpp
-)
-
-list(APPEND WebCorePlatformWPE_SOURCES
-    editing/wpe/EditorWPE.cpp
-
-    platform/glib/EventHandlerGLib.cpp
-
-    platform/graphics/egl/GLContextEGLWPE.cpp
-
-    platform/graphics/wpe/IconWPE.cpp
-    platform/graphics/wpe/ImageWPE.cpp
-
-    platform/wpe/CursorWPE.cpp
-    platform/wpe/LocalizedStringsWPE.cpp
-    platform/wpe/PasteboardWPE.cpp
-    platform/wpe/PlatformKeyboardEventWPE.cpp
-    platform/wpe/PlatformPasteboardWPE.cpp
-    platform/wpe/PlatformScreenWPE.cpp
-    platform/wpe/RenderThemeWPE.cpp
-    platform/wpe/ScrollbarThemeWPE.cpp
-    platform/wpe/ThemeWPE.cpp
-    platform/wpe/WidgetWPE.cpp
-)
-
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.css
 )
@@ -189,15 +91,3 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${UPOWERGLIB_INCLUDE_DIRS}
     ${WPE_INCLUDE_DIRS}
 )
-
-add_library(WebCorePlatformWPE ${WebCore_LIBRARY_TYPE} ${WebCorePlatformWPE_SOURCES})
-add_dependencies(WebCorePlatformWPE WebCore)
-target_include_directories(WebCorePlatformWPE PRIVATE
-    ${WebCore_INCLUDE_DIRECTORIES}
-)
-target_include_directories(WebCorePlatformWPE SYSTEM PRIVATE
-    ${WebCore_SYSTEM_INCLUDE_DIRECTORIES}
-)
-target_link_libraries(WebCorePlatformWPE
-    ${WebCore_LIBRARIES}
-)
diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
new file mode 100644 (file)
index 0000000..4f2119e
--- /dev/null
@@ -0,0 +1,75 @@
+// Copyright (C) 2017 Igalia S.L.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+accessibility/wpe/AXObjectCacheWPE.cpp
+accessibility/wpe/AccessibilityObjectWPE.cpp
+
+editing/wpe/EditorWPE.cpp
+
+loader/soup/CachedRawResourceSoup.cpp
+loader/soup/SubresourceLoaderSoup.cpp
+
+page/linux/ResourceUsageOverlayLinux.cpp
+page/linux/ResourceUsageThreadLinux.cpp
+
+page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
+page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
+
+platform/UserAgentQuirks.cpp
+
+platform/graphics/GLContext.cpp
+platform/graphics/GraphicsContext3DPrivate.cpp
+platform/graphics/PlatformDisplay.cpp
+
+platform/graphics/egl/GLContextEGL.cpp
+platform/graphics/egl/GLContextEGLWPE.cpp
+
+platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
+platform/graphics/opengl/Extensions3DOpenGLES.cpp @no-unify
+platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
+platform/graphics/opengl/TemporaryOpenGLSetting.cpp
+
+platform/graphics/opentype/OpenTypeVerticalData.cpp
+
+platform/graphics/wpe/IconWPE.cpp
+platform/graphics/wpe/ImageWPE.cpp
+platform/graphics/wpe/PlatformDisplayWPE.cpp
+
+platform/text/Hyphenation.cpp
+platform/text/LocaleICU.cpp
+
+platform/unix/LoggingUnix.cpp
+
+platform/wpe/CursorWPE.cpp
+platform/wpe/LocalizedStringsWPE.cpp
+platform/wpe/PasteboardWPE.cpp
+platform/wpe/PlatformKeyboardEventWPE.cpp
+platform/wpe/PlatformPasteboardWPE.cpp
+platform/wpe/PlatformScreenWPE.cpp
+platform/wpe/RenderThemeWPE.cpp
+platform/wpe/ScrollbarThemeWPE.cpp
+platform/wpe/ThemeWPE.cpp
+platform/wpe/WidgetWPE.cpp
+
+platform/xdg/MIMETypeRegistryXdg.cpp
index f7492bb..6bd1e15 100644 (file)
@@ -25,6 +25,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#pragma once
+
 #include "CryptoAlgorithmIdentifier.h"
 #include <array>
 #include <cstring>
index 1e7d727..22855a3 100644 (file)
@@ -3,23 +3,8 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/cairo"
 )
 
-list(APPEND WebCore_SOURCES
-    platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
-    platform/graphics/cairo/CairoUtilities.cpp
-    platform/graphics/cairo/FloatRectCairo.cpp
-    platform/graphics/cairo/FontCairo.cpp
-    platform/graphics/cairo/GradientCairo.cpp
-    platform/graphics/cairo/GraphicsContext3DCairo.cpp
-    platform/graphics/cairo/GraphicsContextCairo.cpp
-    platform/graphics/cairo/ImageBufferCairo.cpp
-    platform/graphics/cairo/ImageCairo.cpp
-    platform/graphics/cairo/IntRectCairo.cpp
-    platform/graphics/cairo/NativeImageCairo.cpp
-    platform/graphics/cairo/PathCairo.cpp
-    platform/graphics/cairo/PatternCairo.cpp
-    platform/graphics/cairo/PlatformContextCairo.cpp
-    platform/graphics/cairo/PlatformPathCairo.cpp
-    platform/graphics/cairo/RefPtrCairo.cpp
+list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
+    "platform/SourcesCairo.txt"
 )
 
 list(APPEND WebCore_LIBRARIES
index f8fd532..5177eab 100644 (file)
@@ -1,23 +1,6 @@
 if (ENABLE_SUBTLE_CRYPTO)
-    list(APPEND WebCore_SOURCES
-        crypto/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmAES_CFBGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmECDHGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmECDSAGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmHKDFGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmPBKDF2GCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmRSA_PSSGCrypt.cpp
-        crypto/gcrypt/CryptoAlgorithmRegistryGCrypt.cpp
-        crypto/gcrypt/CryptoKeyECGCrypt.cpp
-        crypto/gcrypt/CryptoKeyRSAGCrypt.cpp
-        crypto/gcrypt/SerializedCryptoKeyWrapGCrypt.cpp
+    list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
+        "platform/SourcesGCrypt.txt"
     )
 endif ()
 
diff --git a/Source/WebCore/platform/SourcesCairo.txt b/Source/WebCore/platform/SourcesCairo.txt
new file mode 100644 (file)
index 0000000..642acf9
--- /dev/null
@@ -0,0 +1,39 @@
+// Copyright (C) 2017 Igalia S.L.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
+platform/graphics/cairo/CairoUtilities.cpp @no-unify
+platform/graphics/cairo/FloatRectCairo.cpp
+platform/graphics/cairo/FontCairo.cpp
+platform/graphics/cairo/GradientCairo.cpp
+platform/graphics/cairo/GraphicsContext3DCairo.cpp
+platform/graphics/cairo/GraphicsContextCairo.cpp
+platform/graphics/cairo/ImageBufferCairo.cpp
+platform/graphics/cairo/ImageCairo.cpp
+platform/graphics/cairo/IntRectCairo.cpp
+platform/graphics/cairo/NativeImageCairo.cpp
+platform/graphics/cairo/PathCairo.cpp
+platform/graphics/cairo/PatternCairo.cpp
+platform/graphics/cairo/PlatformContextCairo.cpp
+platform/graphics/cairo/PlatformPathCairo.cpp
+platform/graphics/cairo/RefPtrCairo.cpp
diff --git a/Source/WebCore/platform/SourcesGCrypt.txt b/Source/WebCore/platform/SourcesGCrypt.txt
new file mode 100644 (file)
index 0000000..87fd2f4
--- /dev/null
@@ -0,0 +1,41 @@
+// Copyright (C) 2017 Igalia S.L.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+crypto/gcrypt/CryptoAlgorithmAES_CBCGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmAES_CFBGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmAES_GCMGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmAES_KWGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmECDHGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmECDSAGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmHKDFGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmHMACGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmPBKDF2GCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmRSAES_PKCS1_v1_5GCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmRSASSA_PKCS1_v1_5GCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmRSA_OAEPGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmRSA_PSSGCrypt.cpp
+crypto/gcrypt/CryptoAlgorithmRegistryGCrypt.cpp
+crypto/gcrypt/CryptoKeyECGCrypt.cpp
+crypto/gcrypt/CryptoKeyRSAGCrypt.cpp
+crypto/gcrypt/SerializedCryptoKeyWrapGCrypt.cpp
diff --git a/Source/WebCore/platform/SourcesGLib.txt b/Source/WebCore/platform/SourcesGLib.txt
new file mode 100644 (file)
index 0000000..3a18ad4
--- /dev/null
@@ -0,0 +1,37 @@
+// Copyright (C) 2017 Igalia S.L.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+platform/audio/glib/AudioBusGLib.cpp
+
+platform/glib/EventLoopGlib.cpp
+platform/glib/FileMonitorGLib.cpp
+platform/glib/FileSystemGlib.cpp
+platform/glib/KeyedDecoderGlib.cpp
+platform/glib/KeyedEncoderGlib.cpp
+platform/glib/LowPowerModeNotifierGLib.cpp
+platform/glib/MainThreadSharedTimerGLib.cpp
+platform/glib/SSLKeyGeneratorGLib.cpp
+platform/glib/SharedBufferGlib.cpp
+platform/glib/UserAgentGLib.cpp
+
+platform/network/glib/NetworkStateNotifierGLib.cpp
diff --git a/Source/WebCore/platform/SourcesSoup.txt b/Source/WebCore/platform/SourcesSoup.txt
new file mode 100644 (file)
index 0000000..ebdc89f
--- /dev/null
@@ -0,0 +1,44 @@
+// Copyright (C) 2017 Igalia S.L.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+platform/network/soup/AuthenticationChallengeSoup.cpp
+platform/network/soup/CertificateInfo.cpp
+platform/network/soup/CookieJarSoup.cpp
+platform/network/soup/CookieStorageSoup.cpp
+platform/network/soup/CredentialStorageSoup.cpp
+platform/network/soup/DNSSoup.cpp
+platform/network/soup/GRefPtrSoup.cpp
+platform/network/soup/NetworkStorageSessionSoup.cpp
+platform/network/soup/ProxyServerSoup.cpp
+platform/network/soup/ResourceErrorSoup.cpp
+platform/network/soup/ResourceHandleSoup.cpp
+platform/network/soup/ResourceRequestSoup.cpp
+platform/network/soup/ResourceResponseSoup.cpp
+platform/network/soup/SocketStreamHandleImplSoup.cpp
+platform/network/soup/SoupNetworkSession.cpp
+platform/network/soup/SynchronousLoaderClientSoup.cpp
+platform/network/soup/WebKitSoupRequestGeneric.cpp
+
+platform/soup/PublicSuffixSoup.cpp
+platform/soup/SharedBufferSoup.cpp
+platform/soup/URLSoup.cpp
index fa67166..7c12d6e 100644 (file)
@@ -1,5 +1,14 @@
 2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
+        https://bugs.webkit.org/show_bug.cgi?id=178964
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * PlatformWPE.cmake:
+
+2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         [WPE][GTK] Expose availability of certain editing commands in WebKitEditorState
         https://bugs.webkit.org/show_bug.cgi?id=168219
 
index b9f281d..b8683e7 100644 (file)
@@ -434,7 +434,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
 )
 
 list(APPEND WebKit_LIBRARIES
-    WebCorePlatformWPE
+    WebCore
     ${CAIRO_LIBRARIES}
     ${FREETYPE2_LIBRARIES}
     ${GLIB_LIBRARIES}
index 1df8786..a2768c4 100644 (file)
@@ -1,3 +1,12 @@
+2017-10-30  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [WPE] Build more files under WebCore as unified sources and get rid of WebCorePlatformWPE build target
+        https://bugs.webkit.org/show_bug.cgi?id=178964
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * TestWebKitAPI/PlatformWPE.cmake:
+
 2017-10-12  Frederic Wang  <fwang@igalia.com>
 
         Remove support for running safari on the iOS simulator with Xcode < 9.0
index 28de117..ed1ab97 100644 (file)
@@ -56,7 +56,7 @@ add_executable(TestWebCore
     ${TESTWEBKITAPI_DIR}/Tests/WebCore/PublicSuffix.cpp
 )
 
-target_link_libraries(TestWebCore ${test_webcore_LIBRARIES} -Wl,--start-group WebCore WebCoreDerivedSources WebCorePlatformWPE -Wl,--end-group)
+target_link_libraries(TestWebCore ${test_webcore_LIBRARIES} -Wl,--start-group WebCore WebCoreDerivedSources -Wl,--end-group)
 add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
 
 add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)