Diff
Modified: trunk/Source/WTF/ChangeLog (251830 => 251831)
--- trunk/Source/WTF/ChangeLog 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WTF/ChangeLog 2019-10-31 03:06:31 UTC (rev 251831)
@@ -1,3 +1,12 @@
+2019-10-30 Alex Christensen <achristen...@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 <ysuz...@apple.com>
[JSC] Date functions should have intrinsic
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (251830 => 251831)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2019-10-31 03:06:31 UTC (rev 251831)
@@ -64,7 +64,6 @@
mac/DeprecatedSymbolsUsedBySafari.mm
mac/FileSystemMac.mm
- mac/RunLoopMac.mm
mac/SchedulePairMac.mm
posix/FileSystemPOSIX.cpp
Modified: trunk/Source/WebCore/ChangeLog (251830 => 251831)
--- trunk/Source/WebCore/ChangeLog 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebCore/ChangeLog 2019-10-31 03:06:31 UTC (rev 251831)
@@ -1,3 +1,13 @@
+2019-10-30 Alex Christensen <achristen...@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.no...@apple.com>
Add fullscreen style quirk for reddit.com
Modified: trunk/Source/WebCore/PlatformMac.cmake (251830 => 251831)
--- trunk/Source/WebCore/PlatformMac.cmake 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebCore/PlatformMac.cmake 2019-10-31 03:06:31 UTC (rev 251831)
@@ -71,6 +71,7 @@
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 @@
"${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 @@
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_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}")
Modified: trunk/Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm (251830 => 251831)
--- trunk/Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebCore/platform/graphics/mac/WebKitNSImageExtras.mm 2019-10-31 03:06:31 UTC (rev 251831)
@@ -23,10 +23,11 @@
* 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)
Modified: trunk/Source/WebKit/ChangeLog (251830 => 251831)
--- trunk/Source/WebKit/ChangeLog 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebKit/ChangeLog 2019-10-31 03:06:31 UTC (rev 251831)
@@ -1,3 +1,18 @@
+2019-10-30 Alex Christensen <achristen...@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 <pvol...@apple.com>
It should be possible to create a mach sandbox extension for the WebContent process before the audit token is known
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (251830 => 251831)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-10-31 03:06:31 UTC (rev 251831)
@@ -161,7 +161,7 @@
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
addSupplement<LegacyCustomProtocolManager>();
#endif
-#if PLATFORM(COCOA)
+#if PLATFORM(COCOA) && ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
LegacyCustomProtocolManager::networkProcessCreated(*this);
#endif
Modified: trunk/Source/WebKit/PlatformMac.cmake (251830 => 251831)
--- trunk/Source/WebKit/PlatformMac.cmake 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebKit/PlatformMac.cmake 2019-10-31 03:06:31 UTC (rev 251831)
@@ -55,6 +55,7 @@
"${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 @@
${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>")
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm (251830 => 251831)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm 2019-10-31 03:06:31 UTC (rev 251831)
@@ -108,7 +108,14 @@
{
return wkWebAuthenticationType(_panel->clientDataType());
}
-
+#else // ENABLE(WEB_AUTHN)
+- (id <_WKWebAuthenticationPanelDelegate>)delegate
+{
+ return nil;
+}
+- (void)setDelegate:(id<_WKWebAuthenticationPanelDelegate>)delegate
+{
+}
#endif // ENABLE(WEB_AUTHN)
- (void)cancel
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (251830 => 251831)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2019-10-31 03:06:31 UTC (rev 251831)
@@ -139,6 +139,7 @@
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 @@
proxy->connect();
return proxy;
}
+#endif
WebProcessProxy::WebProcessProxy(WebProcessPool& processPool, WebsiteDataStore* websiteDataStore, IsPrewarmed isPrewarmed)
: AuxiliaryProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
Modified: trunk/Tools/ChangeLog (251830 => 251831)
--- trunk/Tools/ChangeLog 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Tools/ChangeLog 2019-10-31 03:06:31 UTC (rev 251831)
@@ -1,5 +1,15 @@
2019-10-30 Alex Christensen <achristen...@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 <achristen...@webkit.org>
+
WKContentRuleLists should block requests from service workers
https://bugs.webkit.org/show_bug.cgi?id=201980
<rdar://problem/55516735>
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (251830 => 251831)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2019-10-31 03:06:31 UTC (rev 251831)
@@ -35,6 +35,7 @@
${WEBCORE_DIR}/testing/cocoa
${WEBKITLEGACY_DIR}
${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa
+ ${WEBKIT_TESTRUNNER_SHARED_DIR}/mac
${WEBKIT_TESTRUNNER_SHARED_DIR}/spi
)
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (251830 => 251831)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2019-10-31 02:51:16 UTC (rev 251830)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2019-10-31 03:06:31 UTC (rev 251831)
@@ -32,6 +32,7 @@
${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
)
