Changeset 272228 in webkit

Timestamp:

Feb 2, 2021 12:57:05 PM (3 years ago)

Author:

achristensen@apple.com

Message:

Adopt UIEventAttribution instead of _UIEventAttribution
​https://bugs.webkit.org/show_bug.cgi?id=220683

Reviewed by John Wilander.

Source/WebKit:

UIKit introduced UIEventAttribution, so let's adopt it so they can remove their SPI.
See rdar://73629041

• UIProcess/API/Cocoa/WKWebViewPrivate.h:
• UIProcess/API/ios/WKWebViewIOS.mm:

(-[WKWebView _setUIEventAttribution:]):
(-[WKWebView _uiEventAttribution]):

Source/WTF:

• wtf/PlatformHave.h:

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:

(-[MockEventAttribution initWithReportEndpoint:destinationURL:]):
(TestWebKitAPI::TEST):
(-[MockEventAttribution initWithReportEndpoint:attributeOn:]): Deleted.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/PlatformHave.h (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (2 diffs)
• Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm (modified) (5 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-02-02  Alex Christensen  <achristensen@webkit.org>
+
+        Adopt UIEventAttribution instead of _UIEventAttribution
+        https://bugs.webkit.org/show_bug.cgi?id=220683
+
+        Reviewed by John Wilander.
+
+        * wtf/PlatformHave.h:
+
 2021-02-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -743 +743 @@
 #endif
 
+#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
+#define HAVE_UI_EVENT_ATTRIBUTION 1
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
     || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-02  Alex Christensen  <achristensen@webkit.org>
+
+        Adopt UIEventAttribution instead of _UIEventAttribution
+        https://bugs.webkit.org/show_bug.cgi?id=220683
+
+        Reviewed by John Wilander.
+
+        UIKit introduced UIEventAttribution, so let's adopt it so they can remove their SPI.
+        See rdar://73629041
+
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView _setUIEventAttribution:]):
+        (-[WKWebView _uiEventAttribution]):
+
 2021-02-02  Rini Patel  <rini_patel@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -109 +109 @@
 #endif
 
+@class UIEventAttribution;
 @class WKBrowsingContextHandle;
 @class WKDownload;
@@ -395 +396 @@
 
 @property (nonatomic, copy, setter=_setEventAttribution:) _UIEventAttribution *_eventAttribution WK_API_AVAILABLE(ios(WK_IOS_TBA));
+@property (nonatomic, copy, setter=_setUIEventAttribution:) UIEventAttribution *_uiEventAttribution WK_API_AVAILABLE(ios(WK_IOS_TBA));
 
 @property (nonatomic, readonly) CGRect _contentVisibleRect WK_API_AVAILABLE(ios(10.0));

trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm

@@ -66 +66 @@
 #endif
 
+#if HAVE(UI_EVENT_ATTRIBUTION)
+#import <UIKit/UIEventAttribution.h>
+#endif
+
 #include "UIKitSoftLink.h"
 
@@ -2523 +2527 @@
 @implementation WKWebView (WKPrivateIOS)
 
+- (void)_setUIEventAttribution:(UIEventAttribution *)attribution
+{
+#if HAVE(UI_EVENT_ATTRIBUTION)
+    if (attribution) {
+        WebCore::PrivateClickMeasurement measurement(
+            WebCore::PrivateClickMeasurement::SourceID(attribution.sourceIdentifier),
+            WebCore::PrivateClickMeasurement::SourceSite(attribution.reportEndpoint),
+            WebCore::PrivateClickMeasurement::AttributeOnSite(attribution.destinationURL),
+            attribution.sourceDescription,
+            attribution.purchaser
+        );
+        _page->setPrivateClickMeasurement(WTFMove(measurement));
+    } else
+        _page->setPrivateClickMeasurement(WTF::nullopt);
+#endif
+}
+
+- (UIEventAttribution *)_uiEventAttribution
+{
+#if HAVE(UI_EVENT_ATTRIBUTION)
+    auto& measurement = _page->privateClickMeasurement();
+    if (!measurement || !measurement->sourceID().isValid())
+        return nil;
+
+    auto attributeOnURL = URL(URL(), makeString("https://", measurement->attributeOnSite().registrableDomain.string()));
+    return [[[UIEventAttribution alloc] initWithSourceIdentifier:measurement->sourceID().id destinationURL:attributeOnURL sourceDescription:measurement->sourceDescription() purchaser:measurement->purchaser()] autorelease];
+#else
+    return nil;
+#endif
+}
+
 - (void)_setEventAttribution:(_UIEventAttribution *)attribution
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-02  Alex Christensen  <achristensen@webkit.org>
+
+        Adopt UIEventAttribution instead of _UIEventAttribution
+        https://bugs.webkit.org/show_bug.cgi?id=220683
+
+        Reviewed by John Wilander.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
+        (-[MockEventAttribution initWithReportEndpoint:destinationURL:]):
+        (TestWebKitAPI::TEST):
+        (-[MockEventAttribution initWithReportEndpoint:attributeOn:]): Deleted.
+
 2021-02-02  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm

@@ -26 +26 @@
 #import "config.h"
 
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(UI_EVENT_ATTRIBUTION)
 
 #import "HTTPServer.h"
@@ -39 +39 @@
 
 @property (nonatomic, assign, readonly) uint8_t sourceIdentifier;
-@property (nonatomic, copy, readonly) NSURL *attributeOn;
+@property (nonatomic, copy, readonly) NSURL *destinationURL;
 @property (nonatomic, copy, readonly) NSURL *reportEndpoint;
 @property (nonatomic, copy, readonly) NSString *sourceDescription;
 @property (nonatomic, copy, readonly) NSString *purchaser;
-- (instancetype)initWithReportEndpoint:(NSURL *)reportEndpoint attributeOn:(NSURL *)attributeOn;
+- (instancetype)initWithReportEndpoint:(NSURL *)reportEndpoint destinationURL:(NSURL *)destinationURL;
 
 @end
@@ -49 +49 @@
 @implementation MockEventAttribution
 
-- (instancetype)initWithReportEndpoint:(NSURL *)reportEndpoint attributeOn:(NSURL *)attributeOn
+- (instancetype)initWithReportEndpoint:(NSURL *)reportEndpoint destinationURL:(NSURL *)destinationURL
 {
     if (!(self = [super init]))
@@ -55 +55 @@
 
     _sourceIdentifier = 42;
-    _attributeOn = attributeOn;
+    _destinationURL = destinationURL;
     _reportEndpoint = reportEndpoint;
     _sourceDescription = @"test source description";
@@ -102 +102 @@
 
     auto exampleURL = [NSURL URLWithString:@"https://example.com/"];
-    auto attribution = [[[MockEventAttribution alloc] initWithReportEndpoint:server.request().URL attributeOn:exampleURL] autorelease];
+    auto attribution = [[[MockEventAttribution alloc] initWithReportEndpoint:server.request().URL destinationURL:exampleURL] autorelease];
     auto webView = [[WKWebView new] autorelease];
-    webView._eventAttribution = (_UIEventAttribution *)attribution;
+    webView._uiEventAttribution = (UIEventAttribution *)attribution;
     [webView.configuration.websiteDataStore _setResourceLoadStatisticsEnabled:YES];
     [webView.configuration.websiteDataStore _allowTLSCertificateChain:@[(id)testCertificate().get()] forHost:serverURL.host];