Changeset 251831 in webkit

Timestamp:

Oct 30, 2019 8:06:31 PM (4 years ago)

Author:

achristensen@apple.com

Message:

Prevent Mac CMake build from bit rotting
​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:

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PlatformMac.cmake (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformMac.cmake (modified) (4 diffs)
• Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• Source/WebKit/PlatformMac.cmake (modified) (2 diffs)
• Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm (modified) (1 diff)
• Source/WebKit/UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/PlatformMac.cmake (modified) (1 diff)
• Tools/WebKitTestRunner/PlatformMac.cmake (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WTF/wtf/PlatformMac.cmake

@@ -65 +65 @@
     mac/DeprecatedSymbolsUsedBySafari.mm
     mac/FileSystemMac.mm
-    mac/RunLoopMac.mm
     mac/SchedulePairMac.mm
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/PlatformMac.cmake

@@ -72 +72 @@
 
 list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/Modules/remoteplayback"
     "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
     "${WEBCORE_DIR}/accessibility/mac"
@@ -87 +88 @@
     "${WEBCORE_DIR}/page/scrolling/cocoa"
     "${WEBCORE_DIR}/page/scrolling/mac"
+    "${WEBCORE_DIR}/platform/audio/cocoa"
     "${WEBCORE_DIR}/platform/audio/mac"
     "${WEBCORE_DIR}/platform/cf"
@@ -344 +346 @@
     platform/mac/DragDataMac.mm
     platform/mac/DragImageMac.mm
-    platform/mac/EventLoopMac.mm
     platform/mac/KeyEventMac.mm
     platform/mac/LocalCurrentGraphicsContext.mm
@@ -570 +571 @@
 list(APPEND WebCore_IDL_FILES
     Modules/plugins/QuickTimePluginReplacement.idl
+
+    Modules/remoteplayback/RemotePlayback.idl
+    Modules/remoteplayback/RemotePlaybackAvailabilityCallback.idl
 )
 

trunk/Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm

@@ -24 +24 @@
  */
 
-#if !PLATFORM(IOS_FAMILY)
 #import "config.h"
 #import "WebKitNSImageExtras.h"
+
+#if !PLATFORM(IOS_FAMILY)
 
 #import <pal/spi/mac/NSImageSPI.h>

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -162 +162 @@
     addSupplement<LegacyCustomProtocolManager>();
 #endif
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
     LegacyCustomProtocolManager::networkProcessCreated(*this);
 #endif

trunk/Source/WebKit/PlatformMac.cmake

@@ -56 +56 @@
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
     "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
+    "${WEBKIT_DIR}/UIProcess/WebAuthentication/Cocoa"
     "${WEBKIT_DIR}/UIProcess/ios"
     "${WEBKIT_DIR}/Platform/cg"
@@ -431 +432 @@
     ${WEBKIT_DIR}
 )
+add_dependencies(SecItemShim WebCore)
 
 # FIXME: These should not be necessary.

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm

@@ -109 +109 @@
     return wkWebAuthenticationType(_panel->clientDataType());
 }
-
+#else // ENABLE(WEB_AUTHN)
+- (id <_WKWebAuthenticationPanelDelegate>)delegate
+{
+    return nil;
+}
+- (void)setDelegate:(id<_WKWebAuthenticationPanelDelegate>)delegate
+{
+}
 #endif // ENABLE(WEB_AUTHN)
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -140 +140 @@
 }
 
+#if ENABLE(SERVICE_WORKER)
 Ref<WebProcessProxy> WebProcessProxy::createForServiceWorkers(WebProcessPool& processPool, RegistrableDomain&& registrableDomain, WebsiteDataStore& websiteDataStore)
 {
@@ -148 +149 @@
     return proxy;
 }
+#endif
 
 WebProcessProxy::WebProcessProxy(WebProcessPool& processPool, WebsiteDataStore* websiteDataStore, IsPrewarmed isPrewarmed)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/DumpRenderTree/PlatformMac.cmake

@@ -36 +36 @@
     ${WEBKITLEGACY_DIR}
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
 )

trunk/Tools/WebKitTestRunner/PlatformMac.cmake

@@ -33 +33 @@
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
     ${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
 )