Title: [282121] trunk/Source/WebKit
- Revision
- 282121
- Author
- achristen...@apple.com
- Date
- 2021-09-07 18:42:21 -0700 (Tue, 07 Sep 2021)
Log Message
Replace PrivateClickMeasurementNetworkLoader::start with an implementation that doesn't need NetworkSession
https://bugs.webkit.org/show_bug.cgi?id=230015
This fixes the internal build after r282110.
* NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
(WebKit::PCM::NetworkLoader::start):
(processPCMRequest): Deleted.
* NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(processPCMRequest):
(WebKit::setPCMDataCarriedOnRequest):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (282120 => 282121)
--- trunk/Source/WebKit/ChangeLog 2021-09-08 01:21:04 UTC (rev 282120)
+++ trunk/Source/WebKit/ChangeLog 2021-09-08 01:42:21 UTC (rev 282121)
@@ -1,3 +1,18 @@
+2021-09-07 Alex Christensen <achristen...@webkit.org>
+
+ Replace PrivateClickMeasurementNetworkLoader::start with an implementation that doesn't need NetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=230015
+
+ This fixes the internal build after r282110.
+
+ * NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm:
+ (WebKit::PCM::NetworkLoader::start):
+ (processPCMRequest): Deleted.
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (processPCMRequest):
+ (WebKit::setPCMDataCarriedOnRequest):
+
2021-09-07 Cameron McCormack <hey...@apple.com>
Add an IPCMessages channel to log all IPC messages
Modified: trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm (282120 => 282121)
--- trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm 2021-09-08 01:21:04 UTC (rev 282120)
+++ trunk/Source/WebKit/NetworkProcess/PrivateClickMeasurement/cocoa/PrivateClickMeasurementNetworkLoaderCocoa.mm 2021-09-08 01:42:21 UTC (rev 282121)
@@ -26,6 +26,7 @@
#import "config.h"
#import "PrivateClickMeasurementNetworkLoader.h"
+#import "NetworkDataTaskCocoa.h"
#import "NetworkSessionCocoa.h"
#import <WebCore/HTTPHeaderValues.h>
#import <WebCore/MIMETypeRegistry.h>
@@ -32,12 +33,6 @@
#import <pal/spi/cf/CFNetworkSPI.h>
#import <wtf/NeverDestroyed.h>
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.h>
-#else
-static void processPCMRequest(WebCore::PrivateClickMeasurement::PcmDataCarried, NSMutableURLRequest *) { }
-#endif
-
@interface WKNetworkSessionDelegateAllowingOnlyNonRedirectedJSON : NSObject <NSURLSessionDataDelegate>
@end
@@ -103,7 +98,7 @@
request.get().HTTPBody = adoptNS([[NSData alloc] initWithBytes:body.data() length:body.length()]).get();
}
- processPCMRequest(pcmDataCarried, request.get());
+ setPCMDataCarriedOnRequest(pcmDataCarried, request.get());
auto identifier = LoadTaskIdentifier::generate();
NSURLSessionDataTask *task = [statelessSessionWithoutRedirects() dataTaskWithRequest:request.get() completionHandler:makeBlockPtr([callback = WTFMove(callback), identifier](NSData *data, NSURLResponse *response, NSError *error) mutable {
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h (282120 => 282121)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h 2021-09-08 01:21:04 UTC (rev 282120)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h 2021-09-08 01:42:21 UTC (rev 282121)
@@ -128,5 +128,6 @@
};
WebCore::Credential serverTrustCredential(const WebCore::AuthenticationChallenge&);
+void setPCMDataCarriedOnRequest(WebCore::PrivateClickMeasurement::PcmDataCarried, NSMutableURLRequest *);
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (282120 => 282121)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2021-09-08 01:21:04 UTC (rev 282120)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2021-09-08 01:42:21 UTC (rev 282121)
@@ -58,10 +58,16 @@
#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.h>
#else
static void overrideAttributionContext(NSMutableURLRequest *) { }
+static void processPCMRequest(WebCore::PrivateClickMeasurement::PcmDataCarried, NSMutableURLRequest *) { }
#endif
namespace WebKit {
+void setPCMDataCarriedOnRequest(WebCore::PrivateClickMeasurement::PcmDataCarried pcmDataCarried, NSMutableURLRequest *request)
+{
+ processPCMRequest(pcmDataCarried, request);
+}
+
#if USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
static void applyBasicAuthorizationHeader(WebCore::ResourceRequest& request, const WebCore::Credential& credential)
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
