Title: [283930] trunk/Source
- Revision
- 283930
- Author
- [email protected]
- Date
- 2021-10-11 13:10:13 -0700 (Mon, 11 Oct 2021)
Log Message
Unified build fix
https://bugs.webkit.org/show_bug.cgi?id=231524
Patch by Alex Christensen <[email protected]> on 2021-10-11
Reviewed by Chris Dumez.
Source/WebCore:
* platform/encryptedmedia/CDMProxy.cpp:
Source/WebKit:
This adds some missing includes and things to fix the build once I add some more files, making the unified build combine differently
* NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
(-[WKNetworkSessionDelegateAllowingOnlyNonRedirectedJSON URLSession:dataTask:didReceiveResponse:completionHandler:]):
* NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h:
* NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm:
* Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (283929 => 283930)
--- trunk/Source/WebCore/ChangeLog 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebCore/ChangeLog 2021-10-11 20:10:13 UTC (rev 283930)
@@ -1,3 +1,12 @@
+2021-10-11 Alex Christensen <[email protected]>
+
+ Unified build fix
+ https://bugs.webkit.org/show_bug.cgi?id=231524
+
+ Reviewed by Chris Dumez.
+
+ * platform/encryptedmedia/CDMProxy.cpp:
+
2021-10-11 Ben Nham <[email protected]>
Add push registration stubs
Modified: trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.cpp (283929 => 283930)
--- trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.cpp 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebCore/platform/encryptedmedia/CDMProxy.cpp 2021-10-11 20:10:13 UTC (rev 283930)
@@ -32,6 +32,7 @@
#if ENABLE(ENCRYPTED_MEDIA)
#include "Logging.h"
+#include "MediaPlayer.h"
#include <wtf/HexNumber.h>
#include <wtf/Scope.h>
#include <wtf/StringPrintStream.h>
Modified: trunk/Source/WebKit/ChangeLog (283929 => 283930)
--- trunk/Source/WebKit/ChangeLog 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebKit/ChangeLog 2021-10-11 20:10:13 UTC (rev 283930)
@@ -1,3 +1,18 @@
+2021-10-11 Alex Christensen <[email protected]>
+
+ Unified build fix
+ https://bugs.webkit.org/show_bug.cgi?id=231524
+
+ Reviewed by Chris Dumez.
+
+ This adds some missing includes and things to fix the build once I add some more files, making the unified build combine differently
+
+ * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
+ (-[WKNetworkSessionDelegateAllowingOnlyNonRedirectedJSON URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h:
+ * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm:
+ * Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm:
+
2021-10-11 Per Arne Vollan <[email protected]>
[macOS] Grant access in sandbox to 'system-privilege' for root
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm (283929 => 283930)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm 2021-10-11 20:10:13 UTC (rev 283930)
@@ -30,6 +30,7 @@
#import <WebCore/HTTPHeaderValues.h>
#import <WebCore/MIMETypeRegistry.h>
#import <pal/spi/cf/CFNetworkSPI.h>
+#import <wtf/BlockPtr.h>
#import <wtf/NeverDestroyed.h>
static RetainPtr<SecTrustRef>& allowedLocalTestServerTrust()
@@ -59,7 +60,7 @@
- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler
{
- if (MIMETypeRegistry::isSupportedJSONMIMEType(response.MIMEType))
+ if (WebCore::MIMETypeRegistry::isSupportedJSONMIMEType(response.MIMEType))
return completionHandler(NSURLSessionResponseAllow);
completionHandler(NSURLSessionResponseCancel);
}
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h (283929 => 283930)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.h 2021-10-11 20:10:13 UTC (rev 283930)
@@ -25,6 +25,7 @@
#pragma once
+#include <wtf/Vector.h>
#include <wtf/spi/darwin/XPCSPI.h>
namespace WebKit {
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm (283929 => 283930)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementXPCUtilities.mm 2021-10-11 20:10:13 UTC (rev 283930)
@@ -26,6 +26,9 @@
#import "config.h"
#import "PrivateClickMeasurementXPCUtilities.h"
+#import "PrivateClickMeasurementManagerInterface.h"
+#import <wtf/OSObjectPtr.h>
+
namespace WebKit {
namespace PCM {
Modified: trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm (283929 => 283930)
--- trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm 2021-10-11 19:58:54 UTC (rev 283929)
+++ trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm 2021-10-11 20:10:13 UTC (rev 283930)
@@ -36,6 +36,7 @@
#import <wtf/FileSystem.h>
#import <wtf/HashSet.h>
#import <wtf/NeverDestroyed.h>
+#import <wtf/OSObjectPtr.h>
#import <wtf/RetainPtr.h>
#import <wtf/RunLoop.h>
#import <wtf/cocoa/Entitlements.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
