Diff
Modified: trunk/ChangeLog (251887 => 251888)
--- trunk/ChangeLog 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,3 +1,13 @@
+2019-10-31 Alex Christensen <achristen...@apple.com>
+
+ Enable more features in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=203699
+
+ Rubber-stamped by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2019-10-31 Alex Christensen <achristen...@webkit.org>
CMake build should make WebKit framework able to be used by Safari
Modified: trunk/Source/WebCore/ChangeLog (251887 => 251888)
--- trunk/Source/WebCore/ChangeLog 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,3 +1,15 @@
+2019-10-31 Alex Christensen <achristen...@apple.com>
+
+ Enable more features in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=203699
+
+ Rubber-stamped by Tim Horton.
+
+ * Modules/pictureinpicture/PictureInPictureWindow.h:
+ * PlatformMac.cmake:
+ * layout/inlineformatting/InlineFormattingContext.cpp:
+ * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+
2019-10-31 Russell Epstein <repst...@apple.com>
Unreviewed, rolling out r251861.
Modified: trunk/Source/WebCore/Modules/pictureinpicture/PictureInPictureWindow.h (251887 => 251888)
--- trunk/Source/WebCore/Modules/pictureinpicture/PictureInPictureWindow.h 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/Modules/pictureinpicture/PictureInPictureWindow.h 2019-10-31 22:45:05 UTC (rev 251888)
@@ -29,6 +29,7 @@
#if ENABLE(PICTURE_IN_PICTURE_API)
#include "EventTarget.h"
+#include "IntSize.h"
#include <wtf/RefCounted.h>
namespace WebCore {
Modified: trunk/Source/WebCore/PAL/ChangeLog (251887 => 251888)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,3 +1,13 @@
+2019-10-31 Alex Christensen <achristen...@apple.com>
+
+ Enable more features in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=203699
+
+ Rubber-stamped by Tim Horton.
+
+ * pal/CMakeLists.txt:
+ * pal/PlatformMac.cmake:
+
2019-10-30 Peng Liu <peng.l...@apple.com>
[Picture-in-Picture Web API] Enable the support for iOS
Modified: trunk/Source/WebCore/PAL/pal/CMakeLists.txt (251887 => 251888)
--- trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/PAL/pal/CMakeLists.txt 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,6 +1,7 @@
set(PAL_PUBLIC_HEADERS
ExportMacros.h
FileSizeFormatter.h
+ Gunzip.h
HysteresisActivity.h
LogMacros.h
Logging.h
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (251887 => 251888)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -34,6 +34,7 @@
spi/cocoa/IOSurfaceSPI.h
spi/cocoa/IOTypesSPI.h
spi/cocoa/LaunchServicesSPI.h
+ spi/cocoa/MetalSPI.h
spi/cocoa/NEFilterSourceSPI.h
spi/cocoa/NSAttributedStringSPI.h
spi/cocoa/NSButtonCellSPI.h
@@ -72,6 +73,7 @@
spi/mac/NSAppearanceSPI.h
spi/mac/NSApplicationSPI.h
spi/mac/NSCellSPI.h
+ spi/mac/NSColorWellSPI.h
spi/mac/NSEventSPI.h
spi/mac/NSFontSPI.h
spi/mac/NSGraphicsSPI.h
@@ -79,6 +81,7 @@
spi/mac/NSImmediateActionGestureRecognizerSPI.h
spi/mac/NSMenuSPI.h
spi/mac/NSPasteboardSPI.h
+ spi/mac/NSPopoverColorWellSPI.h
spi/mac/NSPopoverSPI.h
spi/mac/NSResponderSPI.h
spi/mac/NSScrollViewSPI.h
@@ -114,6 +117,7 @@
cocoa/AppSSOSoftLink.mm
cocoa/AVFoundationSoftLink.mm
cocoa/FileSizeFormatterCocoa.mm
+ cocoa/Gunzip.cpp
cocoa/PassKitSoftLink.mm
crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (251887 => 251888)
--- trunk/Source/WebCore/PlatformMac.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/PlatformMac.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -6,6 +6,7 @@
find_library(CARBON_LIBRARY Carbon)
find_library(CFNETWORK_LIBRARY CFNetwork)
find_library(COCOA_LIBRARY Cocoa)
+find_library(COMPRESSION_LIBRARY Compression)
find_library(COREAUDIO_LIBRARY CoreAudio)
find_library(CORESERVICES_LIBRARY CoreServices)
find_library(DISKARBITRATION_LIBRARY DiskArbitration)
@@ -33,6 +34,7 @@
${CARBON_LIBRARY}
${CFNETWORK_LIBRARY}
${COCOA_LIBRARY}
+ ${COMPRESSION_LIBRARY}
${COREAUDIO_LIBRARY}
${CORESERVICES_LIBRARY}
${DISKARBITRATION_LIBRARY}
@@ -71,15 +73,19 @@
endif ()
list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/Modules/pictureinpicture"
"${WEBCORE_DIR}/Modules/remoteplayback"
+ "${WEBCORE_DIR}/Modules/webauthn/apdu"
"${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
"${WEBCORE_DIR}/accessibility/mac"
"${WEBCORE_DIR}/bridge/objc"
+ "${WEBCORE_DIR}/crypto/mac"
"${WEBCORE_DIR}/editing/cocoa"
"${WEBCORE_DIR}/editing/ios"
"${WEBCORE_DIR}/editing/mac"
"${WEBCORE_DIR}/html/shadow/cocoa"
"${WEBCORE_DIR}/icu"
+ "${WEBCORE_DIR}/layout/tableformatting"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/loader/cf"
"${WEBCORE_DIR}/loader/mac"
@@ -91,6 +97,7 @@
"${WEBCORE_DIR}/platform/audio/mac"
"${WEBCORE_DIR}/platform/cf"
"${WEBCORE_DIR}/platform/cocoa"
+ "${WEBCORE_DIR}/platform/encryptedmedia/clearkey"
"${WEBCORE_DIR}/platform/graphics/avfoundation"
"${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
"${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
@@ -107,6 +114,7 @@
"${WEBCORE_DIR}/platform/graphics/mac"
"${WEBCORE_DIR}/platform/mac"
"${WEBCORE_DIR}/platform/mediacapabilities"
+ "${WEBCORE_DIR}/platform/mediarecorder/cocoa"
"${WEBCORE_DIR}/platform/mediastream/mac"
"${WEBCORE_DIR}/platform/network/cocoa"
"${WEBCORE_DIR}/platform/network/cf"
@@ -139,6 +147,8 @@
list(APPEND WebCore_SOURCES
Modules/paymentrequest/MerchantValidationEvent.cpp
+ Modules/webaudio/MediaStreamAudioSourceCocoa.cpp
+
accessibility/mac/AXObjectCacheMac.mm
accessibility/mac/AccessibilityObjectMac.mm
accessibility/mac/WebAccessibilityObjectWrapperMac.mm
@@ -217,6 +227,8 @@
platform/cocoa/VideoToolboxSoftLink.cpp
platform/cocoa/WebCoreNSErrorExtras.mm
+ platform/encryptedmedia/clearkey/CDMClearKey.cpp
+
platform/gamepad/mac/HIDGamepad.cpp
platform/gamepad/mac/HIDGamepadProvider.cpp
@@ -226,6 +238,7 @@
platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
+ platform/graphics/avfoundation/CDMFairPlayStreaming.cpp
platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
@@ -236,6 +249,7 @@
platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
+ platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm
platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
@@ -428,6 +442,10 @@
)
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+ Modules/applepay/PaymentMethodUpdate.h
+ Modules/applepay/PaymentSessionError.h
+ Modules/applepay/PaymentSummaryItems.h
+
accessibility/mac/WebAccessibilityObjectWrapperBase.h
accessibility/mac/WebAccessibilityObjectWrapperMac.h
@@ -461,6 +479,8 @@
page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.h
page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
+ platform/PictureInPictureSupport.h
+
platform/audio/cocoa/MediaSessionManagerCocoa.h
platform/audio/cocoa/WebAudioBufferList.h
@@ -566,9 +586,41 @@
platform/network/mac/FormDataStreamMac.h
platform/network/mac/UTIUtilities.h
platform/network/mac/WebCoreURLResponse.h
+
+ testing/MockWebAuthenticationConfiguration.h
)
list(APPEND WebCore_IDL_FILES
+ Modules/applepay/ApplePayCancelEvent.idl
+ Modules/applepay/ApplePayContactField.idl
+ Modules/applepay/ApplePayError.idl
+ Modules/applepay/ApplePayErrorCode.idl
+ Modules/applepay/ApplePayErrorContactField.idl
+ Modules/applepay/ApplePayLineItem.idl
+ Modules/applepay/ApplePayMerchantCapability.idl
+ Modules/applepay/ApplePayPayment.idl
+ Modules/applepay/ApplePayPaymentAuthorizationResult.idl
+ Modules/applepay/ApplePayPaymentAuthorizedEvent.idl
+ Modules/applepay/ApplePayPaymentContact.idl
+ Modules/applepay/ApplePayPaymentMethod.idl
+ Modules/applepay/ApplePayPaymentMethodSelectedEvent.idl
+ Modules/applepay/ApplePayPaymentMethodType.idl
+ Modules/applepay/ApplePayPaymentMethodUpdate.idl
+ Modules/applepay/ApplePayPaymentPass.idl
+ Modules/applepay/ApplePayPaymentRequest.idl
+ Modules/applepay/ApplePayRequestBase.idl
+ Modules/applepay/ApplePaySession.idl
+ Modules/applepay/ApplePaySessionError.idl
+ Modules/applepay/ApplePayShippingContactSelectedEvent.idl
+ Modules/applepay/ApplePayShippingContactUpdate.idl
+ Modules/applepay/ApplePayShippingMethod.idl
+ Modules/applepay/ApplePayShippingMethodSelectedEvent.idl
+ Modules/applepay/ApplePayShippingMethodUpdate.idl
+ Modules/applepay/ApplePayValidateMerchantEvent.idl
+
+ Modules/applepay/paymentrequest/ApplePayModifier.idl
+ Modules/applepay/paymentrequest/ApplePayRequest.idl
+
Modules/plugins/QuickTimePluginReplacement.idl
Modules/remoteplayback/RemotePlayback.idl
@@ -589,6 +641,16 @@
DEPENDS Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py
COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
VERBATIM)
+add_custom_command(
+ OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
+ DEPENDS ${_javascript_Core_SCRIPTS_DIR}/xxd.pl ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
+ COMMAND gzip -cn ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt > ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.gz
+ COMMAND ${PERL_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/xxd.pl WHLSLStandardLibrary ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.gz ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
+ VERBATIM)
+list(APPEND WebCore_SOURCES
+ ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibrary.h
+ ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
+)
list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
list(APPEND WebCoreTestSupport_SOURCES
@@ -595,9 +657,18 @@
testing/Internals.mm
testing/MockContentFilter.cpp
testing/MockContentFilterSettings.cpp
+ testing/MockPaymentCoordinator.cpp
testing/MockPreviewLoaderClient.cpp
+ testing/ServiceWorkerInternals.mm
testing/cocoa/WebArchiveDumpSupport.mm
)
+list(APPEND WebCoreTestSupport_IDL_FILES
+ testing/MockPaymentAddress.idl
+ testing/MockPaymentContactFields.idl
+ testing/MockPaymentCoordinator.idl
+ testing/MockPaymentError.idl
+ testing/MockWebAuthenticationConfiguration.idl
+)
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (251887 => 251888)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2019-10-31 22:45:05 UTC (rev 251888)
@@ -35,7 +35,7 @@
#include "LayoutContext.h"
#include "LayoutState.h"
#include "Logging.h"
-#include "Textutil.h"
+#include "TextUtil.h"
#include <wtf/IsoMallocInlines.h>
#include <wtf/text/TextStream.h>
Modified: trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (251887 => 251888)
--- trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp 2019-10-31 22:45:05 UTC (rev 251888)
@@ -28,14 +28,11 @@
#if ENABLE(MEDIA_STREAM)
-#include "AVAudioSessionCaptureDevice.h"
-#include "AVAudioSessionCaptureDeviceManager.h"
#include "AudioSampleBufferList.h"
#include "AudioSampleDataSource.h"
#include "AudioSession.h"
#include "CoreAudioCaptureDevice.h"
#include "CoreAudioCaptureDeviceManager.h"
-#include "CoreAudioCaptureSourceIOS.h"
#include "Logging.h"
#include "Timer.h"
#include "WebAudioSourceProviderAVFObjC.h"
@@ -51,6 +48,12 @@
#include <wtf/NeverDestroyed.h>
#include <pal/cf/CoreMediaSoftLink.h>
+#if PLATFORM(IOS_FAMILY)
+#include "AVAudioSessionCaptureDevice.h"
+#include "AVAudioSessionCaptureDeviceManager.h"
+#include "CoreAudioCaptureSourceIOS.h"
+#endif
+
namespace WebCore {
using namespace PAL;
Modified: trunk/Source/WebKit/ChangeLog (251887 => 251888)
--- trunk/Source/WebKit/ChangeLog 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebKit/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,3 +1,14 @@
+2019-10-31 Alex Christensen <achristen...@apple.com>
+
+ Enable more features in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=203699
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+ * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+ (WebKit::UserMediaCaptureManager::createCaptureSource):
+
2019-10-31 Russell Epstein <repst...@apple.com>
Unreviewed, rolling out r251861.
Modified: trunk/Source/WebKit/PlatformMac.cmake (251887 => 251888)
--- trunk/Source/WebKit/PlatformMac.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebKit/PlatformMac.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -6,6 +6,7 @@
find_library(QUARTZ_LIBRARY Quartz)
find_library(AVFOUNDATION_LIBRARY AVFoundation)
find_library(AVFAUDIO_LIBRARY AVFAudio HINTS ${AVFOUNDATION_LIBRARY}/Versions/*/Frameworks)
+find_library(DEVICEIDENTITY_LIBRARY DeviceIdentity HINTS /System/Library/PrivateFrameworks)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
@@ -16,6 +17,7 @@
list(APPEND WebKit_LIBRARIES
WebKitLegacy
${APPLICATIONSERVICES_LIBRARY}
+ ${DEVICEIDENTITY_LIBRARY}
${SECURITYINTERFACE_LIBRARY}
)
@@ -74,6 +76,7 @@
"${WEBKIT_DIR}/Shared/API/c/cf"
"${WEBKIT_DIR}/Shared/API/c/cg"
"${WEBKIT_DIR}/Shared/API/c/mac"
+ "${WEBKIT_DIR}/Shared/ApplePay/cocoa/"
"${WEBKIT_DIR}/Shared/Authentication/cocoa"
"${WEBKIT_DIR}/Shared/ios"
"${WEBKIT_DIR}/Shared/cf"
@@ -82,6 +85,8 @@
"${WEBKIT_DIR}/Shared/mac"
"${WEBKIT_DIR}/Shared/Plugins/mac"
"${WEBKIT_DIR}/Shared/Scrolling"
+ "${WEBKIT_DIR}/UIProcess/WebAuthentication/fido"
+ "${WEBKIT_DIR}/WebProcess/WebAuthentication"
"${WEBKIT_DIR}/WebProcess/cocoa"
"${WEBKIT_DIR}/WebProcess/mac"
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/Cocoa"
@@ -145,11 +150,14 @@
list(APPEND WebKit_MESSAGES_IN_FILES
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
+ Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in
+
Shared/API/Cocoa/RemoteObjectRegistry.messages.in
UIProcess/ViewGestureController.messages.in
UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in
+ UIProcess/Cocoa/UserMediaCaptureManagerProxy.messages.in
UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
@@ -156,11 +164,16 @@
UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
+ UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy.messages.in
+
UIProcess/ios/EditableImageController.messages.in
UIProcess/mac/SecItemShimProxy.messages.in
+ WebProcess/ApplePay/WebPaymentCoordinator.messages.in
+
WebProcess/cocoa/PlaybackSessionManager.messages.in
+ WebProcess/cocoa/UserMediaCaptureManager.messages.in
WebProcess/cocoa/VideoFullscreenManager.messages.in
WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
Modified: trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp (251887 => 251888)
--- trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp 2019-10-31 22:45:05 UTC (rev 251888)
@@ -254,7 +254,7 @@
return WTFMove(errorMessage);
auto type = device.type() == CaptureDevice::DeviceType::Microphone ? WebCore::RealtimeMediaSource::Type::Audio : WebCore::RealtimeMediaSource::Type::Video;
- auto source = adoptRef(*new Source(String::number(id), type, device.type(), String { settings.label() }, WTFMove(hashSalt), id, *this));
+ auto source = adoptRef(*new Source(String::number(id), type, device.type(), String { settings.label().string() }, WTFMove(hashSalt), id, *this));
source->setSettings(WTFMove(settings));
m_sources.add(id, source.copyRef());
return WebCore::CaptureSourceOrError(WTFMove(source));
Modified: trunk/Source/WebKitLegacy/ChangeLog (251887 => 251888)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
@@ -1,3 +1,12 @@
+2019-10-31 Alex Christensen <achristen...@apple.com>
+
+ Enable more features in Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=203699
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
2019-10-31 Alex Christensen <achristen...@webkit.org>
CMake build should make WebKit framework able to be used by Safari
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (251887 => 251888)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -110,6 +110,7 @@
mac/WebCoreSupport/WebKitFullScreenListener.mm
mac/WebCoreSupport/WebNotificationClient.mm
mac/WebCoreSupport/WebOpenPanelResultListener.mm
+ mac/WebCoreSupport/WebPaymentCoordinatorClient.mm
mac/WebCoreSupport/WebPlatformStrategies.mm
mac/WebCoreSupport/WebPluginInfoProvider.mm
mac/WebCoreSupport/WebProgressTrackerClient.mm
Modified: trunk/Source/cmake/OptionsMac.cmake (251887 => 251888)
--- trunk/Source/cmake/OptionsMac.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/cmake/OptionsMac.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -8,51 +8,110 @@
# FIXME: Many of these defaults differ from the XCode build.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OVERFLOW_SCROLLING_TOUCH PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
+
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V3 PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLE_PAY_SESSION_V4 PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CACHE_PARTITIONING PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_EXTENSIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CONTENT_FILTERING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_CONIC_GRADIENTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_PAINTING_API PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TRAILING_WORD PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_TYPED_OM PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_EXPERIMENTAL_FEATURES PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_IN_PICTURE_API PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_CODE_ATTRIBUTE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_KEYBOARD_KEY_ATTRIBUTE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
+# FIXME: This should be enabled.
+# WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_GESTURE_EVENTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_VIDEO_TOOLBOX PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_METER_ELEMENT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAYMENT_REQUEST PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_EVENTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESIZE_OBSERVER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVER_PRECONNECT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_STREAMS_API PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SVG_FONTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUTHN PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE ON)
+# FIXME: This should be enabled.
+# WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PRIVATE ON)
-# FIXME: These are turned off temporarily to get CMake working easier.
-# https://bugs.webkit.org/show_bug.cgi?id=135856
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE OFF)
-
WEBKIT_OPTION_END()
set(ENABLE_GRAPHICS_CONTEXT_3D ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (251887 => 251888)
--- trunk/Source/cmake/WebKitFeatures.cmake 2019-10-31 22:40:16 UTC (rev 251887)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2019-10-31 22:45:05 UTC (rev 251888)
@@ -226,6 +226,13 @@
WEBKIT_OPTION_DEFINE(ENABLE_WIRELESS_PLAYBACK_TARGET "Enable wireless playback target support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE ${USE_SYSTEM_MALLOC_DEFAULT})
+ WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRAILING_WORD "Enable css trailing word" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_EXPERIMENTAL_FEATURES "Enable experimental features" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_PICTURE_IN_PICTURE_API "Enable picture in picture API" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_MAC_VIDEO_TOOLBOX "Enable Mac video toolbox" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_POINTER_EVENTS "Enable pointer events" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS "Enable webdriver mouse interactions" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS "Enable webdriver keyboard interactions" PRIVATE OFF)
WEBKIT_OPTION_CONFLICT(ENABLE_JIT ENABLE_C_LOOP)
WEBKIT_OPTION_CONFLICT(ENABLE_SAMPLING_PROFILER ENABLE_C_LOOP)
