Title: [219559] trunk/Source/WebCore
- Revision
- 219559
- Author
- mcatanz...@igalia.com
- Date
- 2017-07-17 07:56:40 -0700 (Mon, 17 Jul 2017)
Log Message
Unreviewed, rolling out r219556.
Broke build without WebCrypto
Reverted changeset:
"[CMake] Clean up Web Crypto build targets"
https://bugs.webkit.org/show_bug.cgi?id=174253
http://trac.webkit.org/changeset/219556
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (219558 => 219559)
--- trunk/Source/WebCore/CMakeLists.txt 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-07-17 14:56:40 UTC (rev 219559)
@@ -1296,41 +1296,6 @@
contentextensions/NFAToDFA.cpp
contentextensions/URLFilterParser.cpp
- crypto/CryptoAlgorithm.cpp
- crypto/CryptoAlgorithmRegistry.cpp
- crypto/CryptoKey.cpp
- crypto/SubtleCrypto.cpp
- crypto/WebKitSubtleCrypto.cpp
-
- crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
- crypto/algorithms/CryptoAlgorithmAES_CFB.cpp
- crypto/algorithms/CryptoAlgorithmAES_CTR.cpp
- crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
- crypto/algorithms/CryptoAlgorithmAES_KW.cpp
- crypto/algorithms/CryptoAlgorithmECDH.cpp
- crypto/algorithms/CryptoAlgorithmECDSA.cpp
- crypto/algorithms/CryptoAlgorithmHKDF.cpp
- crypto/algorithms/CryptoAlgorithmHMAC.cpp
- crypto/algorithms/CryptoAlgorithmPBKDF2.cpp
- crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
- crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
- crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
- crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp
- crypto/algorithms/CryptoAlgorithmSHA1.cpp
- crypto/algorithms/CryptoAlgorithmSHA224.cpp
- crypto/algorithms/CryptoAlgorithmSHA256.cpp
- crypto/algorithms/CryptoAlgorithmSHA384.cpp
- crypto/algorithms/CryptoAlgorithmSHA512.cpp
-
- crypto/keys/CryptoKeyAES.cpp
- crypto/keys/CryptoKeyDataOctetSequence.cpp
- crypto/keys/CryptoKeyDataRSAComponents.cpp
- crypto/keys/CryptoKeyEC.cpp
- crypto/keys/CryptoKeyHMAC.cpp
- crypto/keys/CryptoKeyRSA.cpp
- crypto/keys/CryptoKeyRaw.cpp
- crypto/keys/CryptoKeySerializationRaw.cpp
-
css/BasicShapeFunctions.cpp
css/CSSAspectRatioValue.cpp
css/CSSBasicShapes.cpp
Modified: trunk/Source/WebCore/ChangeLog (219558 => 219559)
--- trunk/Source/WebCore/ChangeLog 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/ChangeLog 2017-07-17 14:56:40 UTC (rev 219559)
@@ -1,3 +1,15 @@
+2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, rolling out r219556.
+
+ Broke build without WebCrypto
+
+ Reverted changeset:
+
+ "[CMake] Clean up Web Crypto build targets"
+ https://bugs.webkit.org/show_bug.cgi?id=174253
+ http://trac.webkit.org/changeset/219556
+
2017-07-17 Antoine Quint <grao...@apple.com>
Media controls draw behind captions
Modified: trunk/Source/WebCore/PlatformGTK.cmake (219558 => 219559)
--- trunk/Source/WebCore/PlatformGTK.cmake 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-07-17 14:56:40 UTC (rev 219559)
@@ -8,10 +8,6 @@
include(platform/TextureMapper.cmake)
endif ()
-if (USE_GCRYPT)
- include(platform/GCrypt.cmake)
-endif ()
-
set(WebCore_OUTPUT_NAME WebCoreGTK)
list(APPEND WebCore_INCLUDE_DIRECTORIES
@@ -218,6 +214,7 @@
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
${GUDEV_LIBRARIES}
+ ${LIBGCRYPT_LIBRARIES}
${LIBSECRET_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBTASN1_LIBRARIES}
@@ -244,6 +241,7 @@
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GUDEV_INCLUDE_DIRS}
+ ${LIBGCRYPT_INCLUDE_DIRS}
${LIBSECRET_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
@@ -337,3 +335,61 @@
platform/ScrollAnimationSmooth.cpp
)
endif ()
+
+if (ENABLE_SUBTLE_CRYPTO)
+ list(APPEND WebCore_SOURCES
+ crypto/CryptoAlgorithm.cpp
+ crypto/CryptoAlgorithmRegistry.cpp
+ crypto/CryptoKey.cpp
+ crypto/SubtleCrypto.cpp
+ crypto/WebKitSubtleCrypto.cpp
+
+ crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CFB.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CTR.cpp
+ crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
+ crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+ crypto/algorithms/CryptoAlgorithmECDH.cpp
+ crypto/algorithms/CryptoAlgorithmECDSA.cpp
+ crypto/algorithms/CryptoAlgorithmHKDF.cpp
+ crypto/algorithms/CryptoAlgorithmHMAC.cpp
+ crypto/algorithms/CryptoAlgorithmPBKDF2.cpp
+ crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp
+ crypto/algorithms/CryptoAlgorithmSHA1.cpp
+ crypto/algorithms/CryptoAlgorithmSHA224.cpp
+ crypto/algorithms/CryptoAlgorithmSHA256.cpp
+ crypto/algorithms/CryptoAlgorithmSHA384.cpp
+ crypto/algorithms/CryptoAlgorithmSHA512.cpp
+
+ 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
+
+ crypto/keys/CryptoKeyAES.cpp
+ crypto/keys/CryptoKeyDataOctetSequence.cpp
+ crypto/keys/CryptoKeyDataRSAComponents.cpp
+ crypto/keys/CryptoKeyEC.cpp
+ crypto/keys/CryptoKeyHMAC.cpp
+ crypto/keys/CryptoKeyRSA.cpp
+ crypto/keys/CryptoKeyRaw.cpp
+ crypto/keys/CryptoKeySerializationRaw.cpp
+ )
+endif ()
Modified: trunk/Source/WebCore/PlatformMac.cmake (219558 => 219559)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-07-17 14:56:40 UTC (rev 219559)
@@ -176,7 +176,41 @@
bridge/objc/objc_utility.mm
crypto/CommonCryptoUtilities.cpp
+ crypto/CryptoAlgorithm.cpp
+ crypto/CryptoAlgorithmRegistry.cpp
+ crypto/CryptoKey.cpp
+ crypto/SubtleCrypto.cpp
+ crypto/WebKitSubtleCrypto.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CFB.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CTR.cpp
+ crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
+ crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+ crypto/algorithms/CryptoAlgorithmECDH.cpp
+ crypto/algorithms/CryptoAlgorithmECDSA.cpp
+ crypto/algorithms/CryptoAlgorithmHKDF.cpp
+ crypto/algorithms/CryptoAlgorithmHMAC.cpp
+ crypto/algorithms/CryptoAlgorithmPBKDF2.cpp
+ crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp
+ crypto/algorithms/CryptoAlgorithmSHA1.cpp
+ crypto/algorithms/CryptoAlgorithmSHA224.cpp
+ crypto/algorithms/CryptoAlgorithmSHA256.cpp
+ crypto/algorithms/CryptoAlgorithmSHA384.cpp
+ crypto/algorithms/CryptoAlgorithmSHA512.cpp
+
+ crypto/keys/CryptoKeyAES.cpp
+ crypto/keys/CryptoKeyDataOctetSequence.cpp
+ crypto/keys/CryptoKeyDataRSAComponents.cpp
+ crypto/keys/CryptoKeyEC.cpp
+ crypto/keys/CryptoKeyHMAC.cpp
+ crypto/keys/CryptoKeyRSA.cpp
+ crypto/keys/CryptoKeyRaw.cpp
+ crypto/keys/CryptoKeySerializationRaw.cpp
+
crypto/mac/CommonCryptoDERUtilities.cpp
crypto/mac/CryptoAlgorithmAES_CBCMac.cpp
crypto/mac/CryptoAlgorithmAES_CFBMac.cpp
Modified: trunk/Source/WebCore/PlatformWPE.cmake (219558 => 219559)
--- trunk/Source/WebCore/PlatformWPE.cmake 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/PlatformWPE.cmake 2017-07-17 14:56:40 UTC (rev 219559)
@@ -5,10 +5,6 @@
include(platform/Linux.cmake)
include(platform/TextureMapper.cmake)
-if (USE_GCRYPT)
- include(platform/GCrypt.cmake)
-endif ()
-
# Allow building ANGLE on platforms that don't provide X11 headers.
list(APPEND ANGLE_PLATFORM_DEFINITIONS "USE_WPE")
@@ -171,6 +167,7 @@
${GLIB_LIBRARIES}
${GNUTLS_LIBRARIES}
${ICU_LIBRARIES}
+ ${LIBGCRYPT_LIBRARIES}
${LIBSOUP_LIBRARIES}
${LIBTASN1_LIBRARIES}
${LIBXML2_LIBRARIES}
@@ -185,6 +182,7 @@
${GLIB_INCLUDE_DIRS}
${GNUTLS_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
+ ${LIBGCRYPT_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
@@ -205,3 +203,62 @@
target_link_libraries(WebCorePlatformWPE
${WebCore_LIBRARIES}
)
+
+if (ENABLE_SUBTLE_CRYPTO)
+ list(APPEND WebCore_SOURCES
+ crypto/CryptoAlgorithm.cpp
+ crypto/CryptoAlgorithmRegistry.cpp
+ crypto/CryptoKey.cpp
+ crypto/SubtleCrypto.cpp
+ crypto/WebKitSubtleCrypto.cpp
+
+ crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CFB.cpp
+ crypto/algorithms/CryptoAlgorithmAES_CTR.cpp
+ crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
+ crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+ crypto/algorithms/CryptoAlgorithmECDH.cpp
+ crypto/algorithms/CryptoAlgorithmECDSA.cpp
+ crypto/algorithms/CryptoAlgorithmHKDF.cpp
+ crypto/algorithms/CryptoAlgorithmHMAC.cpp
+ crypto/algorithms/CryptoAlgorithmPBKDF2.cpp
+ crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_PSS.cpp
+ crypto/algorithms/CryptoAlgorithmSHA1.cpp
+ crypto/algorithms/CryptoAlgorithmSHA224.cpp
+ crypto/algorithms/CryptoAlgorithmSHA256.cpp
+ crypto/algorithms/CryptoAlgorithmSHA384.cpp
+ crypto/algorithms/CryptoAlgorithmSHA512.cpp
+
+ 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
+
+ crypto/keys/CryptoKeyAES.cpp
+ crypto/keys/CryptoKeyDataOctetSequence.cpp
+ crypto/keys/CryptoKeyDataRSAComponents.cpp
+ crypto/keys/CryptoKeyEC.cpp
+ crypto/keys/CryptoKeyHMAC.cpp
+ crypto/keys/CryptoKeyRSA.cpp
+ crypto/keys/CryptoKeyRaw.cpp
+ crypto/keys/CryptoKeySerializationRaw.cpp
+ )
+endif ()
+
Deleted: trunk/Source/WebCore/platform/GCrypt.cmake (219558 => 219559)
--- trunk/Source/WebCore/platform/GCrypt.cmake 2017-07-17 12:55:29 UTC (rev 219558)
+++ trunk/Source/WebCore/platform/GCrypt.cmake 2017-07-17 14:56:40 UTC (rev 219559)
@@ -1,29 +0,0 @@
-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
- )
-endif ()
-
-list(APPEND WebCore_LIBRARIES
- ${LIBGCRYPT_LIBRARIES}
-)
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- ${LIBGCRYPT_INCLUDE_DIRS}
-)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
