Diff
Modified: trunk/Source/WebKit/ChangeLog (272236 => 272237)
--- trunk/Source/WebKit/ChangeLog 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/ChangeLog 2021-02-02 22:34:32 UTC (rev 272237)
@@ -1,3 +1,23 @@
+2021-02-02 Alex Christensen <[email protected]>
+
+ Remove all use of _UIEventAttribution
+ https://bugs.webkit.org/show_bug.cgi?id=221289
+ <rdar://problem/73629041>
+
+ Reviewed by John Wilander.
+
+ It has been replaced by UIEventAttribution API.
+
+ * Platform/ios/UIKitSoftLink.h: Removed.
+ * Platform/ios/UIKitSoftLink.mm: Removed.
+ * Platform/spi/ios/UIKitSPI.h:
+ * SourcesCocoa.txt:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _setEventAttribution:]): Deleted.
+ (-[WKWebView _eventAttribution]): Deleted.
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-02-02 Wenson Hsieh <[email protected]>
Add scaffolding to request image extraction after a delay when hovering over images
Deleted: trunk/Source/WebKit/Platform/ios/UIKitSoftLink.h (272236 => 272237)
--- trunk/Source/WebKit/Platform/ios/UIKitSoftLink.h 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/Platform/ios/UIKitSoftLink.h 2021-02-02 22:34:32 UTC (rev 272237)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if PLATFORM(IOS_FAMILY)
-
-#import "UIKitSPI.h"
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_FOR_HEADER(WebKit, UIKit)
-
-SOFT_LINK_CLASS_FOR_HEADER(WebKit, _UIEventAttribution);
-
-#endif
Deleted: trunk/Source/WebKit/Platform/ios/UIKitSoftLink.mm (272236 => 272237)
--- trunk/Source/WebKit/Platform/ios/UIKitSoftLink.mm 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/Platform/ios/UIKitSoftLink.mm 2021-02-02 22:34:32 UTC (rev 272237)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-
-#if PLATFORM(IOS_FAMILY)
-
-#import "UIKitSPI.h"
-#import <wtf/SoftLinking.h>
-
-SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebKit, UIKit)
-
-SOFT_LINK_CLASS_FOR_SOURCE(WebKit, UIKit, _UIEventAttribution)
-
-#endif
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (272236 => 272237)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-02-02 22:34:32 UTC (rev 272237)
@@ -1368,17 +1368,6 @@
@property (nonatomic, setter=_setSuppressSoftwareKeyboard:) BOOL _suppressSoftwareKeyboard;
@end
-@interface _UIEventAttribution : NSObject <NSCopying>
-@property (nonatomic, assign, readonly) uint8_t sourceIdentifier;
-@property (nonatomic, copy, readonly) NSURL *attributeOn;
-@property (nonatomic, /*nullable,*/ copy, readonly) NSURL *reportEndpoint;
-@property (nonatomic, copy, readonly) NSString *sourceDescription;
-@property (nonatomic, copy, readonly) NSString *purchaser;
-- (instancetype)initWithSourceIdentifier:(uint8_t)sourceIdentifier attributeOn:(NSURL *)attributeOn sourceDescription:(NSString *)sourceDescription purchaser:(NSString *)purchaser;
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-@end
-
@interface _UINavigationInteractiveTransitionBase ()
- (void)_stopInteractiveTransition;
@end
Modified: trunk/Source/WebKit/SourcesCocoa.txt (272236 => 272237)
--- trunk/Source/WebKit/SourcesCocoa.txt 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2021-02-02 22:34:32 UTC (rev 272237)
@@ -84,7 +84,6 @@
Platform/ios/AccessibilityIOS.mm
Platform/ios/PaymentAuthorizationController.mm
-Platform/ios/UIKitSoftLink.mm
Platform/IPC/cocoa/ConnectionCocoa.mm
Platform/IPC/cocoa/MachMessage.cpp
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (272236 => 272237)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-02-02 22:34:32 UTC (rev 272237)
@@ -113,7 +113,6 @@
@class WKDownload;
@class WKFrameInfo;
@class WKWebpagePreferences;
-@class _UIEventAttribution;
@class _WKApplicationManifest;
@class _WKFrameHandle;
@class _WKFrameTreeNode;
@@ -394,7 +393,6 @@
@interface WKWebView (WKPrivateIOS)
-@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));
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (272236 => 272237)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2021-02-02 22:34:32 UTC (rev 272237)
@@ -69,8 +69,6 @@
#import <UIKit/UIEventAttribution.h>
#endif
-#include "UIKitSoftLink.h"
-
#define FORWARD_ACTION_TO_WKCONTENTVIEW(_action) \
- (void)_action:(id)sender \
{ \
@@ -2557,31 +2555,6 @@
#endif
}
-- (void)_setEventAttribution:(_UIEventAttribution *)attribution
-{
- if (attribution) {
- WebCore::PrivateClickMeasurement measurement(
- WebCore::PrivateClickMeasurement::SourceID(attribution.sourceIdentifier),
- WebCore::PrivateClickMeasurement::SourceSite(attribution.reportEndpoint),
- WebCore::PrivateClickMeasurement::AttributeOnSite(attribution.attributeOn),
- attribution.sourceDescription,
- attribution.purchaser
- );
- _page->setPrivateClickMeasurement(WTFMove(measurement));
- } else
- _page->setPrivateClickMeasurement(WTF::nullopt);
-}
-
-- (_UIEventAttribution *)_eventAttribution
-{
- auto& measurement = _page->privateClickMeasurement();
- if (!measurement || !measurement->sourceID().isValid())
- return nil;
-
- auto attributeOnURL = URL(URL(), makeString("https://", measurement->attributeOnSite().registrableDomain.string()));
- return [[WebKit::alloc_UIEventAttributionInstance() initWithSourceIdentifier:measurement->sourceID().id attributeOn:attributeOnURL sourceDescription:measurement->sourceDescription() purchaser:measurement->purchaser()] autorelease];
-}
-
- (CGRect)_contentVisibleRect
{
return [self convertRect:[self bounds] toView:self._currentContentView];
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (272236 => 272237)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-02-02 22:25:32 UTC (rev 272236)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-02-02 22:34:32 UTC (rev 272237)
@@ -5668,8 +5668,6 @@
DF74275C24F4955000F8ABE9 /* PDFPluginIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PDFPluginIdentifier.h; sourceTree = "<group>"; };
DF84CEE2249AA21F009096F6 /* WKPDFHUDView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPDFHUDView.mm; path = PDF/WKPDFHUDView.mm; sourceTree = "<group>"; };
DF84CEE3249AA21F009096F6 /* WKPDFHUDView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPDFHUDView.h; path = PDF/WKPDFHUDView.h; sourceTree = "<group>"; };
- DF8523BA2583176F00AEADD0 /* UIKitSoftLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIKitSoftLink.h; sourceTree = "<group>"; };
- DF8523BB258317A900AEADD0 /* UIKitSoftLink.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIKitSoftLink.mm; sourceTree = "<group>"; };
E105FE5318D7B9DE008F57A8 /* EditingRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingRange.h; sourceTree = "<group>"; };
E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; };
@@ -9362,8 +9360,6 @@
A182D5B21BE6BD250087A7CC /* AccessibilityIOS.mm */,
A1798B4F2230A0FE000764BD /* PaymentAuthorizationController.h */,
A1798B502230A0FE000764BD /* PaymentAuthorizationController.mm */,
- DF8523BA2583176F00AEADD0 /* UIKitSoftLink.h */,
- DF8523BB258317A900AEADD0 /* UIKitSoftLink.mm */,
);
path = ios;
sourceTree = "<group>";
