Diff
Modified: trunk/Source/WebCore/ChangeLog (250578 => 250579)
--- trunk/Source/WebCore/ChangeLog 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebCore/ChangeLog 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1,3 +1,12 @@
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards successful CMake build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=202426
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
2019-10-01 Tim Horton <timothy_hor...@apple.com>
Clean up some includes to make the build a bit faster
Modified: trunk/Source/WebCore/PAL/ChangeLog (250578 => 250579)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1,3 +1,12 @@
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards successful CMake build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=202426
+
+ Rubber-stamped by Tim Horton.
+
+ * pal/PlatformMac.cmake:
+
2019-10-01 Keith Rollin <krol...@apple.com>
Remove some support for < iOS 13
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (250578 => 250579)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2019-10-01 20:35:50 UTC (rev 250579)
@@ -3,6 +3,7 @@
cf/CoreMediaSoftLink.h
+ cocoa/AppSSOSoftLink.h
cocoa/AVFoundationSoftLink.h
cocoa/PassKitSoftLink.h
@@ -18,6 +19,8 @@
spi/cg/CoreGraphicsSPI.h
spi/cg/ImageIOSPI.h
+ spi/cocoa/AppSSOSPI.h
+ spi/cocoa/AuthKitSPI.h
spi/cocoa/AVKitSPI.h
spi/cocoa/AudioToolboxSPI.h
spi/cocoa/CFNSURLConnectionSPI.h
@@ -45,8 +48,10 @@
spi/cocoa/NSURLConnectionSPI.h
spi/cocoa/NSURLDownloadSPI.h
spi/cocoa/NSURLFileTypeMappingsSPI.h
+ spi/cocoa/NSXPCConnectionSPI.h
spi/cocoa/PassKitSPI.h
spi/cocoa/QuartzCoreSPI.h
+ spi/cocoa/SecKeyProxySPI.h
spi/cocoa/ServersSPI.h
spi/cocoa/URLFormattingSPI.h
spi/cocoa/WebFilterEvaluatorSPI.h
@@ -105,6 +110,7 @@
cf/CoreMediaSoftLink.cpp
+ cocoa/AppSSOSoftLink.mm
cocoa/AVFoundationSoftLink.mm
cocoa/FileSizeFormatterCocoa.mm
cocoa/PassKitSoftLink.mm
Modified: trunk/Source/WebCore/PlatformMac.cmake (250578 => 250579)
--- trunk/Source/WebCore/PlatformMac.cmake 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebCore/PlatformMac.cmake 2019-10-01 20:35:50 UTC (rev 250579)
@@ -450,7 +450,9 @@
page/mac/WebCoreFrameView.h
page/scrolling/ScrollingStateOverflowScrollProxyNode.h
+
page/scrolling/cocoa/ScrollingTreeFixedNode.h
+ page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h
page/scrolling/cocoa/ScrollingTreePositionedNode.h
page/scrolling/cocoa/ScrollingTreeStickyNode.h
@@ -487,6 +489,8 @@
platform/graphics/avfoundation/MediaPlaybackTargetMac.h
platform/graphics/avfoundation/WebMediaSessionManagerMac.h
+ platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.h
+
platform/graphics/ca/GraphicsLayerCA.h
platform/graphics/ca/LayerPool.h
platform/graphics/ca/PlatformCAAnimation.h
Modified: trunk/Source/WebKit/ChangeLog (250578 => 250579)
--- trunk/Source/WebKit/ChangeLog 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/ChangeLog 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1,3 +1,36 @@
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards successful CMake build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=202426
+
+ Rubber-stamped by Tim Horton.
+
+ * Platform/cocoa/PaymentAuthorizationPresenter.h:
+ * Platform/cocoa/PaymentAuthorizationPresenter.mm:
+ * Platform/cocoa/PaymentAuthorizationViewController.h:
+ * Platform/cocoa/PaymentAuthorizationViewController.mm:
+ * Platform/cocoa/WKPaymentAuthorizationDelegate.mm:
+ * PlatformMac.cmake:
+ * Shared/SandboxExtension.h:
+ (WebKit::SandboxExtension::createHandleForReadByPid):
+ * SourcesCocoa.txt:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore _hasRegisteredServiceWorker]):
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm:
+ * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
+ * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm:
+ * UIProcess/Cocoa/WKShareSheet.mm:
+ (-[WKShareSheet delegate]):
+ (-[WKShareSheet setDelegate:]):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
+ * WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h:
+ * WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp:
+
2019-10-01 Tim Horton <timothy_hor...@apple.com>
Clean up some includes to make the build a bit faster
Modified: trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.h (250578 => 250579)
--- trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.h 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.h 2019-10-01 20:35:50 UTC (rev 250579)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(PASSKIT)
+#if USE(PASSKIT) && ENABLE(APPLE_PAY)
#include <WebCore/ApplePaySessionPaymentRequest.h>
#include <wtf/FastMalloc.h>
@@ -91,4 +91,4 @@
} // namespace WebKit
-#endif // USE(PASSKIT)
+#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm (250578 => 250579)
--- trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -26,7 +26,7 @@
#import "config.h"
#import "PaymentAuthorizationPresenter.h"
-#if USE(PASSKIT)
+#if USE(PASSKIT) && ENABLE(APPLE_PAY)
#import "WKPaymentAuthorizationDelegate.h"
#import "WebPaymentCoordinatorProxyCocoa.h"
@@ -231,4 +231,4 @@
} // namespace WebKit
-#endif // USE(PASSKIT)
+#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.h (250578 => 250579)
--- trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.h 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.h 2019-10-01 20:35:50 UTC (rev 250579)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(PASSKIT)
+#if USE(PASSKIT) && ENABLE(APPLE_PAY)
#include "PaymentAuthorizationPresenter.h"
#include <wtf/RetainPtr.h>
@@ -57,4 +57,4 @@
} // namespace WebKit
-#endif // USE(PASSKIT)
+#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.mm (250578 => 250579)
--- trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -26,7 +26,7 @@
#import "config.h"
#import "PaymentAuthorizationViewController.h"
-#if USE(PASSKIT)
+#if USE(PASSKIT) && ENABLE(APPLE_PAY)
#import "WKPaymentAuthorizationDelegate.h"
#import <pal/cocoa/PassKitSoftLink.h>
@@ -150,4 +150,4 @@
} // namespace WebKit
-#endif // USE(PASSKIT)
+#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm (250578 => 250579)
--- trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKPaymentAuthorizationDelegate.h"
-#if USE(PASSKIT)
+#if USE(PASSKIT) && ENABLE(APPLE_PAY)
#import <WebCore/Payment.h>
#import <WebCore/PaymentMethod.h>
@@ -216,4 +216,4 @@
@end
-#endif // USE(PASSKIT)
+#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/PlatformMac.cmake (250578 => 250579)
--- trunk/Source/WebKit/PlatformMac.cmake 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/PlatformMac.cmake 2019-10-01 20:35:50 UTC (rev 250579)
@@ -18,10 +18,16 @@
list(APPEND WebKit_LIBRARIES ${AVFAUDIO_LIBRARY})
endif ()
+list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
+ "SourcesCocoa.txt"
+)
+
list(APPEND WebKit_SOURCES
NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp
+ NetworkProcess/cocoa/WebSocketTaskCocoa.mm
+
NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
@@ -31,6 +37,7 @@
NetworkProcess/Downloads/PendingDownload.cpp
NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
+ NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm
NetworkProcess/WebStorage/StorageManager.cpp
@@ -106,6 +113,7 @@
Shared/Cocoa/CompletionHandlerCallChecker.mm
Shared/Cocoa/DataDetectionResult.mm
Shared/Cocoa/LoadParametersCocoa.mm
+ Shared/Cocoa/SandboxExtensionCocoa.mm
Shared/Cocoa/WKNSArray.mm
Shared/Cocoa/WKNSData.mm
Shared/Cocoa/WKNSDictionary.mm
@@ -255,6 +263,8 @@
UIProcess/Cocoa/VersionChecks.mm
UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
+ UIProcess/Cocoa/WKSafeBrowsingWarning.mm
+ UIProcess/Cocoa/WKShareSheet.mm
UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
UIProcess/Cocoa/WebPageProxyCocoa.mm
UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
@@ -384,10 +394,13 @@
"${WEBKIT_DIR}/UIProcess/API/C/mac"
"${WEBKIT_DIR}/UIProcess/API/Cocoa"
"${WEBKIT_DIR}/UIProcess/API/mac"
+ "${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
"${WEBKIT_DIR}/UIProcess/Cocoa"
+ "${WEBKIT_DIR}/UIProcess/Cocoa/SOAuthorization"
"${WEBKIT_DIR}/UIProcess/Launcher/mac"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
"${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
+ "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
"${WEBKIT_DIR}/UIProcess/ios"
"${WEBKIT_DIR}/Platform/cg"
"${WEBKIT_DIR}/Platform/classifier"
@@ -422,6 +435,7 @@
"${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree"
"${WEBKIT_DIR}/WebProcess/WebPage/mac"
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
+ "${WEBKITLEGACY_DIR}"
"${FORWARDING_HEADERS_DIR}/WebCore"
)
@@ -468,6 +482,7 @@
UIProcess/ViewGestureController.messages.in
+ UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in
UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
@@ -474,10 +489,18 @@
UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
+ UIProcess/ios/EditableImageController.messages.in
+
UIProcess/mac/SecItemShimProxy.messages.in
+ WebProcess/cocoa/PlaybackSessionManager.messages.in
+ WebProcess/cocoa/VideoFullscreenManager.messages.in
+
+ WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
+
+ WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.messages.in
+
WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.messages.in
- WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
)
set(WebKit_FORWARDING_HEADERS_DIRECTORIES
@@ -737,7 +760,7 @@
# FIXME: These should not be necessary.
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -weak_framework SafariSafeBrowsing -lsandbox -framework AuthKit -framework SecurityInterface")
set(WebKit_OUTPUT_NAME WebKit)
Modified: trunk/Source/WebKit/SourcesCocoa.txt (250578 => 250579)
--- trunk/Source/WebKit/SourcesCocoa.txt 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2019-10-01 20:35:50 UTC (rev 250579)
@@ -431,7 +431,7 @@
UIProcess/ios/WKSyntheticFlagsChangedWebEvent.mm
UIProcess/ios/WKSyntheticTapGestureRecognizer.mm
UIProcess/ios/WKSystemPreviewView.mm
-UIProcess/ios/WKTouchActionGestureRecognizer.m
+UIProcess/ios/WKTouchActionGestureRecognizer.mm
UIProcess/ios/WKWebEvent.mm
UIProcess/Launcher/mac/ProcessLauncherMac.mm
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -59,7 +59,6 @@
#import "WKBackForwardListInternal.h"
#import "WKBackForwardListItemInternal.h"
#import "WKBrowsingContextHandleInternal.h"
-#import "WKDragDestinationAction.h"
#import "WKErrorInternal.h"
#import "WKHistoryDelegatePrivate.h"
#import "WKLayoutMode.h"
@@ -117,6 +116,7 @@
#import <WebCore/ValidationBubble.h>
#import <WebCore/ViewportArguments.h>
#import <WebCore/WritingMode.h>
+#import <WebKit/WKDragDestinationAction.h>
#import <pal/spi/cocoa/NSKeyedArchiverSPI.h>
#import <pal/spi/mac/NSTextFinderSPI.h>
#import <wtf/BlockPtr.h>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -508,7 +508,11 @@
- (bool)_hasRegisteredServiceWorker
{
+#if ENABLE(SERVICE_WORKER)
return FileSystem::fileExists(WebCore::serviceWorkerRegistrationDatabaseFilename(_websiteDataStore->serviceWorkerRegistrationDirectory()));
+#else
+ return NO;
+#endif
}
- (id <_WKWebsiteDataStoreDelegate>)_delegate
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKView.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -32,7 +32,6 @@
#import "APIIconLoadingClient.h"
#import "APIPageConfiguration.h"
#import "WKBrowsingContextGroupPrivate.h"
-#import "WKDragDestinationAction.h"
#import "WKNSData.h"
#import "WKProcessGroupPrivate.h"
#import "WebBackForwardListItem.h"
@@ -43,6 +42,7 @@
#import "WebProcessPool.h"
#import "WebViewImpl.h"
#import "_WKLinkIconParametersInternal.h"
+#import <WebKit/WKDragDestinationAction.h>
#import <pal/spi/cocoa/AVKitSPI.h>
#import <wtf/BlockPtr.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -28,12 +28,12 @@
#if HAVE(APP_SSO)
+#import "APINavigationAction.h"
#import "WKNavigationDelegatePrivate.h"
#import "WKUIDelegate.h"
#import "WKWebViewConfigurationPrivate.h"
#import "WKWebViewInternal.h"
#import <WebCore/ResourceResponse.h>
-#import <WebKit/APINavigationAction.h>
#import <wtf/BlockPtr.h>
@interface WKSOSecretDelegate : NSObject <WKNavigationDelegate, WKUIDelegate> {
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -35,7 +35,7 @@
#import "SOAuthorizationLoadPolicy.h"
#import "WKUIDelegatePrivate.h"
#import "WebPageProxy.h"
-#import "WebSiteDataStore.h"
+#import "WebsiteDataStore.h"
#import <WebCore/ResourceResponse.h>
#import <WebCore/SecurityOrigin.h>
#import <pal/cocoa/AppSSOSoftLink.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -28,9 +28,12 @@
#if ENABLE(FULL_KEYBOARD_ACCESS)
-#import "AccessibilitySupportSPI.h"
#import "WebProcessPool.h"
+#if PLATFORM(IOS_FAMILY)
+#import "AccessibilitySupportSPI.h"
+#endif
+
#if PLATFORM(MAC)
static NSString * const KeyboardUIModeDidChangeNotification = @"com.apple.KeyboardUIModeDidChange";
static const CFStringRef AppleKeyboardUIMode = CFSTR("AppleKeyboardUIMode");
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -48,6 +48,7 @@
@implementation WKShareSheet {
WeakObjCPtr<WKWebView> _webView;
+ WeakObjCPtr<id <WKShareSheetDelegate> > _delegate;
WTF::CompletionHandler<void(bool)> _completionHandler;
#if PLATFORM(MAC)
@@ -58,6 +59,16 @@
#endif
}
+- (id<WKShareSheetDelegate>)delegate
+{
+ return _delegate.get().get();
+}
+
+- (void)setDelegate:(id<WKShareSheetDelegate>)delegate
+{
+ _delegate = delegate;
+}
+
- (instancetype)initWithView:(WKWebView *)view
{
if (!(self = [super init]))
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -26,7 +26,6 @@
#import "config.h"
#import "WebProcessPool.h"
-#import "AccessibilitySupportSPI.h"
#import "CookieStorageUtilsCF.h"
#import "LegacyCustomProtocolManagerClient.h"
#import "Logging.h"
@@ -63,6 +62,7 @@
#if PLATFORM(MAC)
#import <QuartzCore/CARemoteLayerServer.h>
#else
+#import "AccessibilitySupportSPI.h"
#import "UIKitSPI.h"
#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h (250578 => 250579)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2019-10-01 20:35:50 UTC (rev 250579)
@@ -29,7 +29,6 @@
#include "PluginComplexTextInputState.h"
#include "ShareableBitmap.h"
-#include "WKDragDestinationAction.h"
#include "WKLayoutMode.h"
#include "_WKOverlayScrollbarStyle.h"
#include <WebCore/FocusDirection.h>
@@ -36,6 +35,7 @@
#include <WebCore/ScrollTypes.h>
#include <WebCore/TextIndicatorWindow.h>
#include <WebCore/UserInterfaceLayoutDirection.h>
+#include <WebKit/WKDragDestinationAction.h>
#include <pal/spi/cocoa/AVKitSPI.h>
#include <wtf/BlockPtr.h>
#include <wtf/RetainPtr.h>
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (250578 => 250579)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1156,7 +1156,6 @@
6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
711725A9228D564300018514 /* WebsiteLegacyOverflowScrollingTouchPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 711725A8228D563A00018514 /* WebsiteLegacyOverflowScrollingTouchPolicy.h */; };
71A676A622C62325007D6295 /* WKTouchActionGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A676A422C62318007D6295 /* WKTouchActionGestureRecognizer.h */; };
- 71A676A722C6232F007D6295 /* WKTouchActionGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71A676A522C62318007D6295 /* WKTouchActionGestureRecognizer.mm */; };
71FB810B2260627E00323677 /* WebsiteSimulatedMouseEventsDispatchPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB810A2260627A00323677 /* WebsiteSimulatedMouseEventsDispatchPolicy.h */; };
728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
75A8D2C8187CCFAB00C39C9E /* WKWebsiteDataStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A8D2C4187CCF9F00C39C9E /* WKWebsiteDataStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -11553,7 +11552,6 @@
5CA26D83217AD1B800F97A35 /* WKSafeBrowsingWarning.mm in Sources */,
1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
7A78FF332241919B0096483E /* WKStorageAccessAlert.mm in Sources */,
- 71A676A722C6232F007D6295 /* WKTouchActionGestureRecognizer.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp (250578 => 250579)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp 2019-10-01 20:35:50 UTC (rev 250579)
@@ -28,6 +28,7 @@
#if ENABLE(RESOURCE_LOAD_STATISTICS)
+#include "Logging.h"
#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkProcessConnection.h"
#include "WebCoreArgumentCoders.h"
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h (250578 => 250579)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h 2019-10-01 20:35:50 UTC (rev 250579)
@@ -25,6 +25,8 @@
#pragma once
+#if USE(QUICK_LOOK)
+
#include "QuickLookDocumentData.h"
#include <WebCore/PageIdentifier.h>
#include <WebCore/PreviewLoaderClient.h>
@@ -59,3 +61,5 @@
};
} // namespace WebKit
+
+#endif // USE(QUICK_LOOK)
Modified: trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp (250578 => 250579)
--- trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp 2019-10-01 20:35:50 UTC (rev 250579)
@@ -28,6 +28,7 @@
#include "RemoteObjectRegistryMessages.h"
#include "WebPage.h"
+#include "WebProcess.h"
namespace WebKit {
Modified: trunk/Source/WebKitLegacy/ChangeLog (250578 => 250579)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1,5 +1,14 @@
2019-10-01 Alex Christensen <achristen...@webkit.org>
+ Progress towards successful CMake build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=202426
+
+ Rubber-stamped by Tim Horton.
+
+ * PlatformMac.cmake:
+
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
Unify more WebKitLegacy sources
https://bugs.webkit.org/show_bug.cgi?id=202410
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (250578 => 250579)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2019-10-01 20:35:50 UTC (rev 250579)
@@ -2,8 +2,10 @@
find_library(QUARTZ_LIBRARY Quartz)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
+add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
+ "${WEBKITLEGACY_DIR}"
"${WEBKITLEGACY_DIR}/mac"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
@@ -13,6 +15,7 @@
list(APPEND WebKitLegacy_UNIFIED_SOURCE_LIST_FILES
SourcesCocoa.txt
)
+WEBKIT_COMPUTE_SOURCES(WebKitLegacy)
list(APPEND WebKitLegacy_SOURCES
cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -112,6 +115,7 @@
mac/WebCoreSupport/WebProgressTrackerClient.mm
mac/WebCoreSupport/WebSecurityOrigin.mm
mac/WebCoreSupport/WebSelectionServiceController.mm
+ mac/WebCoreSupport/WebSwitchingGPUClient.cpp
mac/WebCoreSupport/WebValidationMessageClient.mm
mac/WebCoreSupport/WebVisitedLinkStore.mm
@@ -132,6 +136,7 @@
mac/WebView/WebHTMLRepresentation.mm
mac/WebView/WebIndicateLayer.mm
mac/WebView/WebJSPDFDoc.mm
+ mac/WebView/WebMediaPlaybackTargetPicker.mm
mac/WebView/WebNavigationData.mm
mac/WebView/WebNotification.mm
mac/WebView/WebPDFDocumentExtras.mm
@@ -140,10 +145,13 @@
mac/WebView/WebResource.mm
mac/WebView/WebTextCompletionController.mm
mac/WebView/WebTextIterator.mm
+ mac/WebView/WebVideoFullscreenController.mm
+ mac/WebView/WebVideoFullscreenHUDWindowController.mm
mac/WebView/WebViewData.mm
+ mac/WebView/WebWindowAnimation.mm
)
-set(WebKitLegacy_FORWARDING_HEADERS_FILES
+set(WebKitLegacy_LEGACY_FORWARDING_HEADERS_FILES
mac/DOM/DOMHTMLHeadingElement.h
mac/DOM/DOMHTMLBaseFontElement.h
mac/DOM/DOMCSSUnknownRule.h
@@ -622,6 +630,14 @@
endif ()
endforeach ()
+foreach (_file ${WebKitLegacy_LEGACY_FORWARDING_HEADERS_FILES})
+ get_filename_component(_name "${_file}" NAME)
+ set(_target_filename "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name}")
+ if (NOT EXISTS ${_target_filename})
+ file(WRITE ${_target_filename} "#import \"${_file}\"")
+ endif ()
+endforeach ()
+
file(COPY
mac/Plugins/Hosted/WebKitPluginAgent.defs
mac/Plugins/Hosted/WebKitPluginAgentReply.defs
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (250578 => 250579)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 20:35:50 UTC (rev 250579)
@@ -1,5 +1,14 @@
2019-10-01 Alex Christensen <achristen...@webkit.org>
+ Progress towards successful CMake build on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=202426
+
+ Rubber-stamped by Tim Horton.
+
+ * WebView/WebDataSource.mm:
+
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
Unify more WebKitLegacy sources
https://bugs.webkit.org/show_bug.cgi?id=202410
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm (250578 => 250579)
--- trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm 2019-10-01 20:35:50 UTC (rev 250579)
@@ -53,7 +53,6 @@
#import <WebCore/FrameLoader.h>
#import <WebCore/LegacyWebArchive.h>
#import <WebCore/MIMETypeRegistry.h>
-#import <WebCore/PreviewLoaderClient.h>
#import <WebCore/ResourceRequest.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/WebCoreObjCExtras.h>
@@ -72,6 +71,7 @@
#endif
#if USE(QUICK_LOOK)
+#import <WebCore/PreviewLoaderClient.h>
#import <WebCore/QuickLook.h>
#endif
Modified: trunk/Source/cmake/OptionsMac.cmake (250578 => 250579)
--- trunk/Source/cmake/OptionsMac.cmake 2019-10-01 20:22:48 UTC (rev 250578)
+++ trunk/Source/cmake/OptionsMac.cmake 2019-10-01 20:35:50 UTC (rev 250579)
@@ -35,6 +35,7 @@
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_SERVICE_CONTROLS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
