Rename _WKVisitedLinkProvider to _WKVisitedLinkStore for consistency
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Aug 2015 22:45:17 +0000 (22:45 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Aug 2015 22:45:17 +0000 (22:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148398

Reviewed by Tim Horton.

We'd like to call the abstract classes providers and the concrete classes stores in WebKit. Begin by renaming
_WKVisitedLinkProvider to _WKVisitedLinkStore, but keep the former around as a deprecated class.

* Shared/API/Cocoa/WebKitPrivate.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _visitedLinkStore]):
(-[WKWebViewConfiguration _setVisitedLinkStore:]):
(-[WKWebViewConfiguration _visitedLinkProvider]):
(-[WKWebViewConfiguration _setVisitedLinkProvider:]):
(-[WKWebViewConfiguration _validate]):
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/API/Cocoa/_WKVisitedLinkProvider.h:
* UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm:
(-[_WKVisitedLinkProvider init]): Deleted.
(-[_WKVisitedLinkProvider dealloc]): Deleted.
(-[_WKVisitedLinkProvider addVisitedLinkWithURL:]): Deleted.
(-[_WKVisitedLinkProvider removeAll]): Deleted.
(-[_WKVisitedLinkProvider _apiObject]): Deleted.
* UIProcess/API/Cocoa/_WKVisitedLinkStore.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h.
* UIProcess/API/Cocoa/_WKVisitedLinkStore.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm.
(-[_WKVisitedLinkStore init]):
(-[_WKVisitedLinkStore dealloc]):
(-[_WKVisitedLinkStore addVisitedLinkWithURL:]):
(-[_WKVisitedLinkStore removeAll]):
(-[_WKVisitedLinkStore _apiObject]):
* UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h.
(WebKit::wrapper):
* WebKit2.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h
Source/WebKit2/Shared/Cocoa/APIObject.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.h [new file with mode: 0644]
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm [new file with mode: 0644]
Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h with 86% similarity]
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index f7e69ae..ee27735 100644 (file)
@@ -1,3 +1,44 @@
+2015-08-24  Anders Carlsson  <andersca@apple.com>
+
+        Rename _WKVisitedLinkProvider to _WKVisitedLinkStore for consistency
+        https://bugs.webkit.org/show_bug.cgi?id=148398
+
+        Reviewed by Tim Horton.
+
+        We'd like to call the abstract classes providers and the concrete classes stores in WebKit. Begin by renaming
+        _WKVisitedLinkProvider to _WKVisitedLinkStore, but keep the former around as a deprecated class.
+
+        * Shared/API/Cocoa/WebKitPrivate.h:
+        * Shared/Cocoa/APIObject.mm:
+        (API::Object::newObject):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView initWithFrame:configuration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration _visitedLinkStore]):
+        (-[WKWebViewConfiguration _setVisitedLinkStore:]):
+        (-[WKWebViewConfiguration _visitedLinkProvider]):
+        (-[WKWebViewConfiguration _setVisitedLinkProvider:]):
+        (-[WKWebViewConfiguration _validate]):
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+        * UIProcess/API/Cocoa/_WKVisitedLinkProvider.h:
+        * UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm:
+        (-[_WKVisitedLinkProvider init]): Deleted.
+        (-[_WKVisitedLinkProvider dealloc]): Deleted.
+        (-[_WKVisitedLinkProvider addVisitedLinkWithURL:]): Deleted.
+        (-[_WKVisitedLinkProvider removeAll]): Deleted.
+        (-[_WKVisitedLinkProvider _apiObject]): Deleted.
+        * UIProcess/API/Cocoa/_WKVisitedLinkStore.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.h.
+        * UIProcess/API/Cocoa/_WKVisitedLinkStore.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm.
+        (-[_WKVisitedLinkStore init]):
+        (-[_WKVisitedLinkStore dealloc]):
+        (-[_WKVisitedLinkStore addVisitedLinkWithURL:]):
+        (-[_WKVisitedLinkStore removeAll]):
+        (-[_WKVisitedLinkStore _apiObject]):
+        * UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkProviderInternal.h.
+        (WebKit::wrapper):
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2015-08-24  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Use _NSScrollingPredominantAxisFilter for wheel event filtering on Mac
index 9881fb4..acf8624 100644 (file)
@@ -35,4 +35,4 @@
 #import <WebKit/_WKFormInputSession.h>
 #import <WebKit/_WKProcessPoolConfiguration.h>
 #import <WebKit/_WKThumbnailView.h>
-#import <WebKit/_WKVisitedLinkProvider.h>
+#import <WebKit/_WKVisitedLinkStore.h>
index 568a32e..7b25390 100644 (file)
@@ -66,7 +66,7 @@
 #import "_WKProcessPoolConfigurationInternal.h"
 #import "_WKUserContentExtensionStoreInternal.h"
 #import "_WKUserContentFilterInternal.h"
-#import "_WKVisitedLinkProviderInternal.h"
+#import "_WKVisitedLinkStoreInternal.h"
 #import <objc/objc-auto.h>
 
 namespace API {
@@ -207,7 +207,7 @@ void* Object::newObject(size_t size, Type type)
         break;
 
     case Type::VisitedLinkProvider:
-        wrapper = [_WKVisitedLinkProvider alloc];
+        wrapper = [_WKVisitedLinkStore alloc];
         break;
 
     case Type::WebsiteDataRecord:
index 0e01f85..0501bca 100644 (file)
@@ -76,7 +76,7 @@
 #import "_WKFormDelegate.h"
 #import "_WKRemoteObjectRegistryInternal.h"
 #import "_WKSessionStateInternal.h"
-#import "_WKVisitedLinkProviderInternal.h"
+#import "_WKVisitedLinkStoreInternal.h"
 #import <WebCore/IOSurface.h>
 #import <wtf/HashMap.h>
 #import <wtf/MathExtras.h>
@@ -310,7 +310,7 @@ static bool shouldAllowPictureInPictureMediaPlayback()
         pageConfiguration->setRelatedPage(relatedWebView->_page.get());
 
     pageConfiguration->setUserContentController([_configuration userContentController]->_userContentControllerProxy.get());
-    pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkProvider]->_visitedLinkProvider.get());
+    pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkStore]->_visitedLinkProvider.get());
     pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
     pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure([_configuration _treatsSHA1SignedCertificatesAsInsecure]);
 
index 8fc5591..d1619c9 100644 (file)
@@ -83,7 +83,7 @@ private:
     LazyInitialized<RetainPtr<WKProcessPool>> _processPool;
     LazyInitialized<RetainPtr<WKPreferences>> _preferences;
     LazyInitialized<RetainPtr<WKUserContentController>> _userContentController;
-    LazyInitialized<RetainPtr<_WKVisitedLinkProvider>> _visitedLinkProvider;
+    LazyInitialized<RetainPtr<_WKVisitedLinkStore>> _visitedLinkStore;
     LazyInitialized<RetainPtr<WKWebsiteDataStore>> _websiteDataStore;
     WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
     WebKit::WeakObjCPtr<WKWebView> _alternateWebViewForNavigationGestures;
@@ -127,7 +127,7 @@ private:
     configuration.preferences = self.preferences;
     configuration.userContentController = self.userContentController;
     configuration.websiteDataStore = self.websiteDataStore;
-    configuration._visitedLinkProvider = self._visitedLinkProvider;
+    configuration._visitedLinkStore = self._visitedLinkStore;
     configuration._relatedWebView = _relatedWebView.get().get();
     configuration._alternateWebViewForNavigationGestures = _alternateWebViewForNavigationGestures.get().get();
     configuration->_treatsSHA1SignedCertificatesAsInsecure = _treatsSHA1SignedCertificatesAsInsecure;
@@ -211,14 +211,14 @@ static NSString *defaultApplicationNameForUserAgent()
     _applicationNameForUserAgent.set(adoptNS([applicationNameForUserAgent copy]));
 }
 
-- (_WKVisitedLinkProvider *)_visitedLinkProvider
+- (_WKVisitedLinkStore *)_visitedLinkStore
 {
-    return _visitedLinkProvider.get([] { return adoptNS([[_WKVisitedLinkProvider alloc] init]); });
+    return _visitedLinkStore.get([] { return adoptNS([[_WKVisitedLinkStore alloc] init]); });
 }
 
-- (void)_setVisitedLinkProvider:(_WKVisitedLinkProvider *)visitedLinkProvider
+- (void)_setVisitedLinkStore:(_WKVisitedLinkStore *)visitedLinkStore
 {
-    _visitedLinkProvider.set(visitedLinkProvider);
+    _visitedLinkStore.set(visitedLinkStore);
 }
 
 #pragma clang diagnostic push
@@ -234,6 +234,16 @@ 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)
@@ -262,8 +272,8 @@ static NSString *defaultApplicationNameForUserAgent()
     if (!self.websiteDataStore)
         [NSException raise:NSInvalidArgumentException format:@"configuration.websiteDataStore is nil"];
 
-    if (!self._visitedLinkProvider)
-        [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkProvider is nil"];
+    if (!self._visitedLinkStore)
+        [NSException raise:NSInvalidArgumentException format:@"configuration._visitedLinkStore is nil"];
 
 #if PLATFORM(IOS)
     if (!self._contentProviderRegistry)
index bfe2efa..7c4543f 100644 (file)
@@ -29,6 +29,7 @@
 
 @class WKWebView;
 @class _WKVisitedLinkProvider;
+@class _WKVisitedLinkStore;
 @class _WKWebsiteDataStore;
 
 @interface WKWebViewConfiguration (WKPrivate)
@@ -36,9 +37,7 @@
 @property (nonatomic, weak, setter=_setRelatedWebView:) WKWebView *_relatedWebView;
 @property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier;
 
-@property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider;
-
-@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use websiteDataStore instead");
+@property (nonatomic, strong, setter=_setVisitedLinkStore:) _WKVisitedLinkStore *_visitedLinkStore;
 
 @property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
 
 @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_AVAILABLE(NA, WK_IOS_TBA);
 #endif
 
+@property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use visitedLinkStore instead");
+
+@property (nonatomic, strong, setter=_setWebsiteDataStore:) _WKWebsiteDataStore *_websiteDataStore WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use websiteDataStore instead");
+
 @end
 
 #endif
index b5a3d4b..6dc13c7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * 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
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Foundation/Foundation.h>
-#import <WebKit/WKFoundation.h>
+#import <WebKit/_WKVisitedLinkStore.h>
 
 #if WK_API_ENABLED
 
-WK_CLASS_AVAILABLE(10_10, 8_0)
-@interface _WKVisitedLinkProvider : NSObject
-
-- (void)addVisitedLinkWithURL:(NSURL *)URL;
-- (void)removeAll;
-
+WK_CLASS_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use _WKVisitedLinkStore instead")
+@interface _WKVisitedLinkProvider : _WKVisitedLinkStore
 @end
 
 #endif
index dd6a791..5cae95e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * 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
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "config.h"
-#import "_WKVisitedLinkProviderInternal.h"
+#include "config.h"
+#include "_WKVisitedLinkProvider.h"
 
 #if WK_API_ENABLED
 
-#import "VisitedLinkProvider.h"
-#import <WebCore/LinkHash.h>
-
 @implementation _WKVisitedLinkProvider
-
-- (instancetype)init
-{
-    if (!(self = [super init]))
-        return nil;
-
-    API::Object::constructInWrapper<WebKit::VisitedLinkProvider>(self);
-
-    return self;
-}
-
-- (void)dealloc
-{
-    _visitedLinkProvider->~VisitedLinkProvider();
-
-    [super dealloc];
-}
-
-- (void)addVisitedLinkWithURL:(NSURL *)URL
-{
-    auto linkHash = WebCore::visitedLinkHash(URL.absoluteString);
-
-    _visitedLinkProvider->addVisitedLinkHash(linkHash);
-}
-
-- (void)removeAll
-{
-    _visitedLinkProvider->removeAll();
-}
-
-#pragma mark WKObject protocol implementation
-
-- (API::Object&)_apiObject
-{
-    return *_visitedLinkProvider;
-}
-
 @end
 
 #endif
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.h b/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.h
new file mode 100644 (file)
index 0000000..e5a8176
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 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 <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+WK_CLASS_AVAILABLE(10_10, 8_0)
+@interface _WKVisitedLinkStore : NSObject
+
+- (void)addVisitedLinkWithURL:(NSURL *)URL;
+- (void)removeAll;
+
+@end
+
+#endif
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm b/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
new file mode 100644 (file)
index 0000000..f1fb3f1
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2014 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"
+#import "_WKVisitedLinkStoreInternal.h"
+
+#if WK_API_ENABLED
+
+#import "VisitedLinkProvider.h"
+#import <WebCore/LinkHash.h>
+
+@implementation _WKVisitedLinkStore
+
+- (instancetype)init
+{
+    if (!(self = [super init]))
+        return nil;
+
+    API::Object::constructInWrapper<WebKit::VisitedLinkProvider>(self);
+
+    return self;
+}
+
+- (void)dealloc
+{
+    _visitedLinkProvider->~VisitedLinkProvider();
+
+    [super dealloc];
+}
+
+- (void)addVisitedLinkWithURL:(NSURL *)URL
+{
+    auto linkHash = WebCore::visitedLinkHash(URL.absoluteString);
+
+    _visitedLinkProvider->addVisitedLinkHash(linkHash);
+}
+
+- (void)removeAll
+{
+    _visitedLinkProvider->removeAll();
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+    return *_visitedLinkProvider;
+}
+
+@end
+
+#endif
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "_WKVisitedLinkProvider.h"
+#import "_WKVisitedLinkStore.h"
 
 #if WK_API_ENABLED
 
 
 namespace WebKit {
 
-inline _WKVisitedLinkProvider *wrapper(VisitedLinkProvider& visitedLinkProvider)
+inline _WKVisitedLinkStore *wrapper(VisitedLinkProvider& visitedLinkProvider)
 {
-    ASSERT([visitedLinkProvider.wrapper() isKindOfClass:[_WKVisitedLinkProvider class]]);
-    return (_WKVisitedLinkProvider *)visitedLinkProvider.wrapper();
+    ASSERT([visitedLinkProvider.wrapper() isKindOfClass:[_WKVisitedLinkStore class]]);
+    return (_WKVisitedLinkStore *)visitedLinkProvider.wrapper();
 }
 
 }
 
-@interface _WKVisitedLinkProvider () <WKObject> {
+@interface _WKVisitedLinkStore () <WKObject> {
 @package
     API::ObjectStorage<WebKit::VisitedLinkProvider> _visitedLinkProvider;
 }
index f982421..c1c44cf 100644 (file)
                1A1EF1991A1D5B420023200A /* APIDataCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1EF1971A1D5B420023200A /* APIDataCocoa.mm */; };
                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 */; };
                1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */; };
                1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */; };
-               1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */; };
+               1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */; };
+               1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */; };
                1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */; };
                1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */; };
                1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */; };
                1A1FEC191627B3EF00700F6D /* WebConnection.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebConnection.messages.in; sourceTree = "<group>"; };
                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>"; };
                1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
                1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
                1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessage.h; sourceTree = "<group>"; };
-               1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = "<group>"; };
-               1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProvider.h; sourceTree = "<group>"; };
-               1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProviderInternal.h; sourceTree = "<group>"; };
+               1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkStore.mm; sourceTree = "<group>"; };
+               1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStore.h; sourceTree = "<group>"; };
+               1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStoreInternal.h; sourceTree = "<group>"; };
                1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabaseTracker.cpp; sourceTree = "<group>"; };
                1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabaseTracker.h; sourceTree = "<group>"; };
                1A8E7D3818C150BF005A702A /* VisitedLinkTableController.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VisitedLinkTableController.messages.in; sourceTree = "<group>"; };
                                7CD5EBBC1746B04C000C1C45 /* WKTypeRefWrapper.mm */,
                                BC8699B2116AADAA002A925B /* WKView.h */,
                                BFA6179E12F0B99D0033E0CA /* WKViewPrivate.h */,
+                               1A2067911B8B906600C13C36 /* _WKVisitedLinkProvider.h */,
+                               1A2067901B8B906600C13C36 /* _WKVisitedLinkProvider.mm */,
                        );
                        name = Deprecated;
                        sourceTree = "<group>";
                                7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */,
                                7C89D2B71A6B0F2C003A5FDE /* _WKUserContentFilter.mm */,
                                7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */,
-                               1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */,
-                               1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */,
-                               1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */,
+                               1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */,
+                               1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */,
+                               1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */,
                                FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */,
                                7CEFA9601AC0999300B910FD /* APIUserContentExtensionStoreCocoa.mm */,
                                1A3635AB1A3145E500ED6197 /* APIWebsiteDataStoreCocoa.mm */,
                                7CA3793E1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h in Headers */,
                                7C89D2BA1A6B0F2C003A5FDE /* _WKUserContentFilter.h in Headers */,
                                7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */,
-                               1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */,
-                               1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */,
+                               1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */,
+                               1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */,
                                1AFB4C6E1ADF0C7800B33339 /* _WKWebsiteDataRecord.h in Headers */,
                                1AFB4C721ADF155D00B33339 /* _WKWebsiteDataStore.h in Headers */,
                                1A4A93B71AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h in Headers */,
                                BC017D0916260FF4007054F5 /* WKDOMElement.h in Headers */,
                                BC017D0B16260FF4007054F5 /* WKDOMInternals.h in Headers */,
                                BC017D0D16260FF4007054F5 /* WKDOMNode.h in Headers */,
+                               1A2067931B8B906600C13C36 /* _WKVisitedLinkProvider.h in Headers */,
                                BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */,
                                BC39C4361626366F008BC689 /* WKDOMRange.h in Headers */,
                                BC5D24C516CD7088007D5461 /* WKDOMRangePrivate.h in Headers */,
                                2D6B371C18A967AD0042AE80 /* _WKThumbnailView.mm in Sources */,
                                7C2413021AACFA7500A58C15 /* _WKUserContentExtensionStore.mm in Sources */,
                                7C89D2B91A6B0F2C003A5FDE /* _WKUserContentFilter.mm in Sources */,
-                               1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */,
+                               1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */,
                                1AFB4C711ADF155D00B33339 /* _WKWebsiteDataStore.mm in Sources */,
                                A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */,
                                A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
                                1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */,
                                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
                                BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */,
+                               1A2067921B8B906600C13C36 /* _WKVisitedLinkProvider.mm in Sources */,
                                1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
                                9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */,
                                1A043CEB124FE38F00FFBFB5 /* PluginProcessMessageReceiver.cpp in Sources */,