From 997807c0788bc6a0060d59737c8d5cab46c2ed15 Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Sun, 14 Aug 2016 21:45:49 +0000 Subject: [PATCH] =?utf8?q?[Cocoa]=20Remove=20deprecated=20=5FWKVisitedLink?= =?utf8?q?Provider=20declarations=20that=20aren=E2=80=99t=20needed=20https?= =?utf8?q?://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D160846?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed by Darin Adler. * UIProcess/API/Cocoa/WKWebViewConfiguration.mm: (-[WKWebViewConfiguration _visitedLinkProvider]): Moved into WKBinaryCompatibilityIOS10 cateogry implementation, changed type to _WKVisitedLinkStore. (-[WKWebViewConfiguration _setVisitedLinkProvider:]): Ditto. * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Removed property declaration. * UIProcess/API/Cocoa/_WKVisitedLinkProvider.h: Removed. * UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm: Moved declaration in here. * WebKit2.xcodeproj/project.pbxproj: Updated for header removal. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204454 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 18 ++++++++++++ .../UIProcess/API/Cocoa/WKWebViewConfiguration.mm | 26 ++++++++++------- .../API/Cocoa/WKWebViewConfigurationPrivate.h | 3 -- .../UIProcess/API/Cocoa/_WKVisitedLinkProvider.h | 34 ---------------------- .../UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm | 7 ++++- Source/WebKit2/WebKit2.xcodeproj/project.pbxproj | 4 --- 6 files changed, 39 insertions(+), 53 deletions(-) delete mode 100644 Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index b370db5..5a1a0da 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,21 @@ +2016-08-14 Dan Bernstein + + [Cocoa] Remove deprecated _WKVisitedLinkProvider declarations that aren’t needed + https://bugs.webkit.org/show_bug.cgi?id=160846 + + Reviewed by Darin Adler. + + * UIProcess/API/Cocoa/WKWebViewConfiguration.mm: + (-[WKWebViewConfiguration _visitedLinkProvider]): Moved into WKBinaryCompatibilityIOS10 + cateogry implementation, changed type to _WKVisitedLinkStore. + (-[WKWebViewConfiguration _setVisitedLinkProvider:]): Ditto. + * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Removed property declaration. + + * UIProcess/API/Cocoa/_WKVisitedLinkProvider.h: Removed. + * UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm: Moved declaration in here. + + * WebKit2.xcodeproj/project.pbxproj: Updated for header removal. + 2016-08-12 Dan Bernstein [Cocoa] Instances of WKObject subclasses don’t work correctly with CFGetTypeID() diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm index 3f581b8..7a24559 100644 --- a/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm +++ b/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm @@ -35,7 +35,7 @@ #import "WKUserContentController.h" #import "WKWebViewContentProviderRegistry.h" #import "WeakObjCPtr.h" -#import "_WKVisitedLinkProvider.h" +#import "_WKVisitedLinkStore.h" #import "_WKWebsiteDataStoreInternal.h" #import #import @@ -396,16 +396,6 @@ static NSString *defaultApplicationNameForUserAgent() self.websiteDataStore = websiteDataStore ? websiteDataStore->_dataStore.get() : nullptr; } --(_WKVisitedLinkProvider *)_visitedLinkProvider -{ - return (_WKVisitedLinkProvider *)self._visitedLinkStore; -} - -- (void)_setVisitedLinkProvider:(_WKVisitedLinkProvider *)_visitedLinkProvider -{ - self._visitedLinkStore = _visitedLinkProvider; -} - #pragma clang diagnostic pop #if PLATFORM(IOS) @@ -763,4 +753,18 @@ static NSString *defaultApplicationNameForUserAgent() @end +@implementation WKWebViewConfiguration (WKBinaryCompatibilityWithIOS10) + +-(_WKVisitedLinkStore *)_visitedLinkProvider +{ + return self._visitedLinkStore; +} + +- (void)_setVisitedLinkProvider:(_WKVisitedLinkStore *)visitedLinkProvider +{ + self._visitedLinkStore = visitedLinkProvider; +} + +@end + #endif // WK_API_ENABLED diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h b/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h index b8cd48d..3e52a26 100644 --- a/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h +++ b/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h @@ -28,7 +28,6 @@ #if WK_API_ENABLED @class WKWebView; -@class _WKVisitedLinkProvider; @class _WKVisitedLinkStore; @class _WKWebsiteDataStore; @@ -68,8 +67,6 @@ @property (nonatomic, readwrite, setter=_setRequiresUserActionForEditingControlsManager:) BOOL _requiresUserActionForEditingControlsManager WK_API_AVAILABLE(macosx(WK_MAC_TBA)); #endif -@property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider WK_API_DEPRECATED_WITH_REPLACEMENT("_visitedLinkStore", macosx(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA)); - @property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_API_DEPRECATED_WITH_REPLACEMENT("websiteDataStore", macosx(10.10, 10.11), ios(8.0, 9.0)); @property (nonatomic, setter=_setRequiresUserActionForAudioPlayback:) BOOL _requiresUserActionForAudioPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); @property (nonatomic, setter=_setRequiresUserActionForVideoPlayback:) BOOL _requiresUserActionForVideoPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA)); diff --git a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h b/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h deleted file mode 100644 index 3e6019f..0000000 --- a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2015 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 - -#if WK_API_ENABLED - -WK_CLASS_DEPRECATED_WITH_REPLACEMENT("_WKVisitedLinkStore", macosx(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA)) -@interface _WKVisitedLinkProvider : _WKVisitedLinkStore -@end - -#endif diff --git a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm b/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm index 5cae95e..66dcd9f 100644 --- a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm +++ b/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm @@ -24,10 +24,15 @@ */ #include "config.h" -#include "_WKVisitedLinkProvider.h" +#include "_WKVisitedLinkStore.h" #if WK_API_ENABLED +// Defined for binary compatibility with Safari in iOS 10. + +@interface _WKVisitedLinkProvider : _WKVisitedLinkStore +@end + @implementation _WKVisitedLinkProvider @end diff --git a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj index c632fbc..8111459 100644 --- a/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj +++ b/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj @@ -165,7 +165,6 @@ 1A1FEC1C1627B45700700F6D /* WebConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */; }; 1A1FEC1D1627B45700700F6D /* WebConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */; }; 1A2067921B8B906600C13C36 /* _WKVisitedLinkProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */; }; - 1A2067931B8B906600C13C36 /* _WKVisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2067911B8B906600C13C36 /* _WKVisitedLinkProvider.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */; }; 1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */; }; 1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */; }; @@ -2144,7 +2143,6 @@ 1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebConnectionMessageReceiver.cpp; sourceTree = ""; }; 1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebConnectionMessages.h; sourceTree = ""; }; 1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = ""; }; - 1A2067911B8B906600C13C36 /* _WKVisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProvider.h; sourceTree = ""; }; 1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeObjectMap.h; sourceTree = ""; }; 1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeObjectMap.cpp; sourceTree = ""; }; 1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeUtilities.cpp; sourceTree = ""; }; @@ -4243,7 +4241,6 @@ 1A43E826188F38E2009E4D30 /* Deprecated */ = { isa = PBXGroup; children = ( - 1A2067911B8B906600C13C36 /* _WKVisitedLinkProvider.h */, 1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */, 1AFB4C6C1ADF0C7800B33339 /* _WKWebsiteDataRecord.h */, 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */, @@ -7445,7 +7442,6 @@ 7CB365AD1D31DC10007158CA /* _WKUserInitiatedActionInternal.h in Headers */, 2D87861D1BDB54BF00D02ABB /* _WKUserStyleSheet.h in Headers */, 2D8786201BDB57F500D02ABB /* _WKUserStyleSheetInternal.h in Headers */, - 1A2067931B8B906600C13C36 /* _WKVisitedLinkProvider.h in Headers */, 1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */, 1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */, 1AFB4C6E1ADF0C7800B33339 /* _WKWebsiteDataRecord.h in Headers */, -- 1.8.3.1