Diff
Modified: trunk/Source/WebKit2/ChangeLog (204453 => 204454)
--- trunk/Source/WebKit2/ChangeLog 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-14 21:45:49 UTC (rev 204454)
@@ -1,3 +1,21 @@
+2016-08-14 Dan Bernstein <[email protected]>
+
+ [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 <[email protected]>
[Cocoa] Instances of WKObject subclasses don’t work correctly with CFGetTypeID()
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (204453 => 204454)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-08-14 21:45:49 UTC (rev 204454)
@@ -35,7 +35,7 @@
#import "WKUserContentController.h"
#import "WKWebViewContentProviderRegistry.h"
#import "WeakObjCPtr.h"
-#import "_WKVisitedLinkProvider.h"
+#import "_WKVisitedLinkStore.h"
#import "_WKWebsiteDataStoreInternal.h"
#import <WebCore/RuntimeApplicationChecks.h>
#import <wtf/RetainPtr.h>
@@ -396,16 +396,6 @@
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 @@
@end
+@implementation WKWebViewConfiguration (WKBinaryCompatibilityWithIOS10)
+
+-(_WKVisitedLinkStore *)_visitedLinkProvider
+{
+ return self._visitedLinkStore;
+}
+
+- (void)_setVisitedLinkProvider:(_WKVisitedLinkStore *)visitedLinkProvider
+{
+ self._visitedLinkStore = visitedLinkProvider;
+}
+
+@end
+
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (204453 => 204454)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-08-14 21:45:49 UTC (rev 204454)
@@ -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));
Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h (204453 => 204454)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h 2016-08-14 21:45:49 UTC (rev 204454)
@@ -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 <WebKit/_WKVisitedLinkStore.h>
-
-#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
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm (204453 => 204454)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm 2016-08-14 21:45:49 UTC (rev 204454)
@@ -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
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (204453 => 204454)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-14 18:29:24 UTC (rev 204453)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-14 21:45:49 UTC (rev 204454)
@@ -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 = "<group>"; };
1A1FEC1B1627B45700700F6D /* WebConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebConnectionMessages.h; sourceTree = "<group>"; };
1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = "<group>"; };
- 1A2067911B8B906600C13C36 /* _WKVisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProvider.h; sourceTree = "<group>"; };
1A2161AE11F37664008AD0F5 /* NPRuntimeObjectMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRuntimeObjectMap.h; sourceTree = "<group>"; };
1A2161AF11F37664008AD0F5 /* NPRuntimeObjectMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeObjectMap.cpp; sourceTree = "<group>"; };
1A2162AE11F38971008AD0F5 /* NPRuntimeUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NPRuntimeUtilities.cpp; sourceTree = "<group>"; };
@@ -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 */,
