Prevent Mac CMake build from bit rotting
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Oct 2019 03:06:31 +0000 (03:06 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Oct 2019 03:06:31 +0000 (03:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=203647

Source/WebCore:

Rubber-stamped by Tim Horton.

* PlatformMac.cmake:
* platform/graphics/mac/WebKitNSImageExtras.mm:

Source/WebKit:

Rubber-stamped by Tim Horton.

* NetworkProcess/NetworkProcess.cpp:
(WebKit::m_messagePortChannelRegistry):
* PlatformMac.cmake:
* UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
(-[_WKWebAuthenticationPanel delegate]):
(-[_WKWebAuthenticationPanel setDelegate:]):
* UIProcess/WebProcessProxy.cpp:

Source/WTF:

Reviewed by Tim Horton.

* wtf/PlatformMac.cmake:

Tools:

Rubber-stamped by Tim Horton.

* DumpRenderTree/PlatformMac.cmake:
* WebKitTestRunner/PlatformMac.cmake:

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

13 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformMac.cmake
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkProcess.cpp
Source/WebKit/PlatformMac.cmake
Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm
Source/WebKit/UIProcess/WebProcessProxy.cpp
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake
Tools/WebKitTestRunner/PlatformMac.cmake

index 8321dbd..5e60b1b 100644 (file)
@@ -1,3 +1,12 @@
+2019-10-30  Alex Christensen  <achristensen@webkit.org>
+
+        Prevent Mac CMake build from bit rotting
+        https://bugs.webkit.org/show_bug.cgi?id=203647
+
+        Reviewed by Tim Horton.
+
+        * wtf/PlatformMac.cmake:
+
 2019-10-30  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Date functions should have intrinsic
index 39d2fea..c674ba3 100644 (file)
@@ -64,7 +64,6 @@ list(APPEND WTF_SOURCES
 
     mac/DeprecatedSymbolsUsedBySafari.mm
     mac/FileSystemMac.mm
-    mac/RunLoopMac.mm
     mac/SchedulePairMac.mm
 
     posix/FileSystemPOSIX.cpp
index c1e2293..0d16179 100644 (file)
@@ -1,3 +1,13 @@
+2019-10-30  Alex Christensen  <achristensen@webkit.org>
+
+        Prevent Mac CMake build from bit rotting
+        https://bugs.webkit.org/show_bug.cgi?id=203647
+
+        Rubber-stamped by Tim Horton.
+
+        * PlatformMac.cmake:
+        * platform/graphics/mac/WebKitNSImageExtras.mm:
+
 2019-10-30  Jer Noble  <jer.noble@apple.com>
 
         Add fullscreen style quirk for reddit.com
index 17a221e..d7e287f 100644 (file)
@@ -71,6 +71,7 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
 endif ()
 
 list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/Modules/remoteplayback"
     "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
     "${WEBCORE_DIR}/accessibility/mac"
     "${WEBCORE_DIR}/bridge/objc"
@@ -86,6 +87,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/page/mac"
     "${WEBCORE_DIR}/page/scrolling/cocoa"
     "${WEBCORE_DIR}/page/scrolling/mac"
+    "${WEBCORE_DIR}/platform/audio/cocoa"
     "${WEBCORE_DIR}/platform/audio/mac"
     "${WEBCORE_DIR}/platform/cf"
     "${WEBCORE_DIR}/platform/cocoa"
@@ -343,7 +345,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/CursorMac.mm
     platform/mac/DragDataMac.mm
     platform/mac/DragImageMac.mm
-    platform/mac/EventLoopMac.mm
     platform/mac/KeyEventMac.mm
     platform/mac/LocalCurrentGraphicsContext.mm
     platform/mac/LoggingMac.mm
@@ -569,6 +570,9 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
 
 list(APPEND WebCore_IDL_FILES
     Modules/plugins/QuickTimePluginReplacement.idl
+
+    Modules/remoteplayback/RemotePlayback.idl
+    Modules/remoteplayback/RemotePlaybackAvailabilityCallback.idl
 )
 
 set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
index 6622e99..76fffbe 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if !PLATFORM(IOS_FAMILY)
 #import "config.h"
 #import "WebKitNSImageExtras.h"
 
+#if !PLATFORM(IOS_FAMILY)
+
 #import <pal/spi/mac/NSImageSPI.h>
 
 @implementation NSImage (WebKitExtras)
index 9e3b3c4..b960407 100644 (file)
@@ -1,3 +1,18 @@
+2019-10-30  Alex Christensen  <achristensen@webkit.org>
+
+        Prevent Mac CMake build from bit rotting
+        https://bugs.webkit.org/show_bug.cgi?id=203647
+
+        Rubber-stamped by Tim Horton.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::m_messagePortChannelRegistry):
+        * PlatformMac.cmake:
+        * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
+        (-[_WKWebAuthenticationPanel delegate]):
+        (-[_WKWebAuthenticationPanel setDelegate:]):
+        * UIProcess/WebProcessProxy.cpp:
+
 2019-10-30  Per Arne Vollan  <pvollan@apple.com>
 
         It should be possible to create a mach sandbox extension for the WebContent process before the audit token is known
index ebb3ee3..4f8f0aa 100644 (file)
@@ -161,7 +161,7 @@ NetworkProcess::NetworkProcess(AuxiliaryProcessInitializationParameters&& parame
 #if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
     addSupplement<LegacyCustomProtocolManager>();
 #endif
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
     LegacyCustomProtocolManager::networkProcessCreated(*this);
 #endif
 
index 7a5c3cc..c3fe854 100644 (file)
@@ -55,6 +55,7 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
+    "${WEBKIT_DIR}/UIProcess/WebAuthentication/Cocoa"
     "${WEBKIT_DIR}/UIProcess/ios"
     "${WEBKIT_DIR}/Platform/cg"
     "${WEBKIT_DIR}/Platform/classifier"
@@ -430,6 +431,7 @@ target_include_directories(SecItemShim PRIVATE
     ${FORWARDING_HEADERS_DIR}
     ${WEBKIT_DIR}
 )
+add_dependencies(SecItemShim WebCore)
 
 # FIXME: These should not be necessary.
 file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
index 3ad3075..4474bac 100644 (file)
@@ -108,7 +108,14 @@ static _WKWebAuthenticationType wkWebAuthenticationType(WebCore::ClientDataType
 {
     return wkWebAuthenticationType(_panel->clientDataType());
 }
-
+#else // ENABLE(WEB_AUTHN)
+- (id <_WKWebAuthenticationPanelDelegate>)delegate
+{
+    return nil;
+}
+- (void)setDelegate:(id<_WKWebAuthenticationPanelDelegate>)delegate
+{
+}
 #endif // ENABLE(WEB_AUTHN)
 
 - (void)cancel
index e9b07c6..71359ef 100644 (file)
@@ -139,6 +139,7 @@ Ref<WebProcessProxy> WebProcessProxy::create(WebProcessPool& processPool, Websit
     return proxy;
 }
 
+#if ENABLE(SERVICE_WORKER)
 Ref<WebProcessProxy> WebProcessProxy::createForServiceWorkers(WebProcessPool& processPool, RegistrableDomain&& registrableDomain, WebsiteDataStore& websiteDataStore)
 {
     auto proxy = adoptRef(*new WebProcessProxy(processPool, &websiteDataStore, IsPrewarmed::No));
@@ -147,6 +148,7 @@ Ref<WebProcessProxy> WebProcessProxy::createForServiceWorkers(WebProcessPool& pr
     proxy->connect();
     return proxy;
 }
+#endif
 
 WebProcessProxy::WebProcessProxy(WebProcessPool& processPool, WebsiteDataStore* websiteDataStore, IsPrewarmed isPrewarmed)
     : AuxiliaryProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
index e5511a4..efd6ab4 100644 (file)
@@ -1,5 +1,15 @@
 2019-10-30  Alex Christensen  <achristensen@webkit.org>
 
+        Prevent Mac CMake build from bit rotting
+        https://bugs.webkit.org/show_bug.cgi?id=203647
+
+        Rubber-stamped by Tim Horton.
+
+        * DumpRenderTree/PlatformMac.cmake:
+        * WebKitTestRunner/PlatformMac.cmake:
+
+2019-10-30  Alex Christensen  <achristensen@webkit.org>
+
         WKContentRuleLists should block requests from service workers
         https://bugs.webkit.org/show_bug.cgi?id=201980
         <rdar://problem/55516735>
index aa3d69f..8b31673 100644 (file)
@@ -35,6 +35,7 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     ${WEBCORE_DIR}/testing/cocoa
     ${WEBKITLEGACY_DIR}
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
 )
 
index abef1de..54d2bfa 100644 (file)
@@ -32,6 +32,7 @@ list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
 )