Changeset 188895 in webkit


Ignore:
Timestamp:
Aug 24, 2015 4:51:01 PM (9 years ago)
Author:
andersca@apple.com
Message:

Rename VisitedLinkProvider to VisitedLinkStore
​https://bugs.webkit.org/show_bug.cgi?id=148406

Reviewed by Tim Horton.

  • DerivedSources.make:
  • Shared/API/APIObject.h:
  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

  • UIProcess/API/APIPageConfiguration.cpp:

(API::PageConfiguration::copy):
(API::PageConfiguration::visitedLinkStore):
(API::PageConfiguration::setVisitedLinkStore):
(API::PageConfiguration::visitedLinkProvider): Deleted.
(API::PageConfiguration::setVisitedLinkProvider): Deleted.

  • UIProcess/API/APIPageConfiguration.h:
  • UIProcess/API/C/WKContext.cpp:

(WKContextAddVisitedLink):
(WKContextClearVisitedLinks):

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/API/Cocoa/_WKVisitedLinkStore.mm:

(-[_WKVisitedLinkStore init]):
(-[_WKVisitedLinkStore dealloc]):
(-[_WKVisitedLinkStore addVisitedLinkWithURL:]):
(-[_WKVisitedLinkStore removeAll]):
(-[_WKVisitedLinkStore _apiObject]):

  • UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h:

(WebKit::wrapper):

  • UIProcess/VisitedLinkProvider.cpp:

(WebKit::generateIdentifier): Deleted.
(WebKit::VisitedLinkProvider::create): Deleted.
(WebKit::VisitedLinkProvider::~VisitedLinkProvider): Deleted.
(WebKit::VisitedLinkProvider::VisitedLinkProvider): Deleted.
(WebKit::VisitedLinkProvider::addProcess): Deleted.
(WebKit::VisitedLinkProvider::removeProcess): Deleted.
(WebKit::VisitedLinkProvider::addVisitedLinkHash): Deleted.
(WebKit::VisitedLinkProvider::removeAll): Deleted.
(WebKit::VisitedLinkProvider::webProcessWillOpenConnection): Deleted.
(WebKit::VisitedLinkProvider::webProcessDidCloseConnection): Deleted.
(WebKit::VisitedLinkProvider::addVisitedLinkHashFromPage): Deleted.
(WebKit::nextPowerOf2): Deleted.
(WebKit::tableSizeForKeyCount): Deleted.
(WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired): Deleted.
(WebKit::VisitedLinkProvider::resizeTable): Deleted.
(WebKit::VisitedLinkProvider::sendTable): Deleted.

  • UIProcess/VisitedLinkStore.cpp: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.cpp.

(WebKit::generateIdentifier):
(WebKit::VisitedLinkStore::create):
(WebKit::VisitedLinkStore::~VisitedLinkStore):
(WebKit::VisitedLinkStore::VisitedLinkStore):
(WebKit::VisitedLinkStore::addProcess):
(WebKit::VisitedLinkStore::removeProcess):
(WebKit::VisitedLinkStore::addVisitedLinkHash):
(WebKit::VisitedLinkStore::removeAll):
(WebKit::VisitedLinkStore::webProcessWillOpenConnection):
(WebKit::VisitedLinkStore::webProcessDidCloseConnection):
(WebKit::VisitedLinkStore::addVisitedLinkHashFromPage):
(WebKit::nextPowerOf2):
(WebKit::tableSizeForKeyCount):
(WebKit::VisitedLinkStore::pendingVisitedLinksTimerFired):
(WebKit::VisitedLinkStore::resizeTable):
(WebKit::VisitedLinkStore::sendTable):

  • UIProcess/VisitedLinkStore.h: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.h.
  • UIProcess/VisitedLinkStore.messages.in: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in.
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::processDidFinishLaunching):
(WebKit::WebPageProxy::creationParameters):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::createWebPage):

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::shutDown):
(WebKit::WebProcessProxy::addVisitedLinkStore):
(WebKit::WebProcessProxy::didDestroyVisitedLinkStore):
(WebKit::WebProcessProxy::addVisitedLinkProvider): Deleted.
(WebKit::WebProcessProxy::didDestroyVisitedLinkProvider): Deleted.

  • UIProcess/WebProcessProxy.h:
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebPage/VisitedLinkTableController.cpp:

(WebKit::VisitedLinkTableController::addVisitedLink):

Location:
trunk/Source/WebKit2
Files:
18 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r188892 r188895  
     12015-08-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Rename VisitedLinkProvider to VisitedLinkStore
     4        https://bugs.webkit.org/show_bug.cgi?id=148406
     5
     6        Reviewed by Tim Horton.
     7
     8        * DerivedSources.make:
     9        * Shared/API/APIObject.h:
     10        * Shared/Cocoa/APIObject.mm:
     11        (API::Object::newObject):
     12        * UIProcess/API/APIPageConfiguration.cpp:
     13        (API::PageConfiguration::copy):
     14        (API::PageConfiguration::visitedLinkStore):
     15        (API::PageConfiguration::setVisitedLinkStore):
     16        (API::PageConfiguration::visitedLinkProvider): Deleted.
     17        (API::PageConfiguration::setVisitedLinkProvider): Deleted.
     18        * UIProcess/API/APIPageConfiguration.h:
     19        * UIProcess/API/C/WKContext.cpp:
     20        (WKContextAddVisitedLink):
     21        (WKContextClearVisitedLinks):
     22        * UIProcess/API/Cocoa/WKWebView.mm:
     23        (-[WKWebView initWithFrame:configuration:]):
     24        * UIProcess/API/Cocoa/_WKVisitedLinkStore.mm:
     25        (-[_WKVisitedLinkStore init]):
     26        (-[_WKVisitedLinkStore dealloc]):
     27        (-[_WKVisitedLinkStore addVisitedLinkWithURL:]):
     28        (-[_WKVisitedLinkStore removeAll]):
     29        (-[_WKVisitedLinkStore _apiObject]):
     30        * UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h:
     31        (WebKit::wrapper):
     32        * UIProcess/VisitedLinkProvider.cpp:
     33        (WebKit::generateIdentifier): Deleted.
     34        (WebKit::VisitedLinkProvider::create): Deleted.
     35        (WebKit::VisitedLinkProvider::~VisitedLinkProvider): Deleted.
     36        (WebKit::VisitedLinkProvider::VisitedLinkProvider): Deleted.
     37        (WebKit::VisitedLinkProvider::addProcess): Deleted.
     38        (WebKit::VisitedLinkProvider::removeProcess): Deleted.
     39        (WebKit::VisitedLinkProvider::addVisitedLinkHash): Deleted.
     40        (WebKit::VisitedLinkProvider::removeAll): Deleted.
     41        (WebKit::VisitedLinkProvider::webProcessWillOpenConnection): Deleted.
     42        (WebKit::VisitedLinkProvider::webProcessDidCloseConnection): Deleted.
     43        (WebKit::VisitedLinkProvider::addVisitedLinkHashFromPage): Deleted.
     44        (WebKit::nextPowerOf2): Deleted.
     45        (WebKit::tableSizeForKeyCount): Deleted.
     46        (WebKit::VisitedLinkProvider::pendingVisitedLinksTimerFired): Deleted.
     47        (WebKit::VisitedLinkProvider::resizeTable): Deleted.
     48        (WebKit::VisitedLinkProvider::sendTable): Deleted.
     49        * UIProcess/VisitedLinkStore.cpp: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.cpp.
     50        (WebKit::generateIdentifier):
     51        (WebKit::VisitedLinkStore::create):
     52        (WebKit::VisitedLinkStore::~VisitedLinkStore):
     53        (WebKit::VisitedLinkStore::VisitedLinkStore):
     54        (WebKit::VisitedLinkStore::addProcess):
     55        (WebKit::VisitedLinkStore::removeProcess):
     56        (WebKit::VisitedLinkStore::addVisitedLinkHash):
     57        (WebKit::VisitedLinkStore::removeAll):
     58        (WebKit::VisitedLinkStore::webProcessWillOpenConnection):
     59        (WebKit::VisitedLinkStore::webProcessDidCloseConnection):
     60        (WebKit::VisitedLinkStore::addVisitedLinkHashFromPage):
     61        (WebKit::nextPowerOf2):
     62        (WebKit::tableSizeForKeyCount):
     63        (WebKit::VisitedLinkStore::pendingVisitedLinksTimerFired):
     64        (WebKit::VisitedLinkStore::resizeTable):
     65        (WebKit::VisitedLinkStore::sendTable):
     66        * UIProcess/VisitedLinkStore.h: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.h.
     67        * UIProcess/VisitedLinkStore.messages.in: Renamed from Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in.
     68        * UIProcess/WebPageProxy.cpp:
     69        (WebKit::WebPageProxy::WebPageProxy):
     70        (WebKit::WebPageProxy::processDidFinishLaunching):
     71        (WebKit::WebPageProxy::creationParameters):
     72        * UIProcess/WebPageProxy.h:
     73        * UIProcess/WebProcessPool.cpp:
     74        (WebKit::WebProcessPool::WebProcessPool):
     75        (WebKit::WebProcessPool::createWebPage):
     76        * UIProcess/WebProcessPool.h:
     77        * UIProcess/WebProcessProxy.cpp:
     78        (WebKit::WebProcessProxy::shutDown):
     79        (WebKit::WebProcessProxy::addVisitedLinkStore):
     80        (WebKit::WebProcessProxy::didDestroyVisitedLinkStore):
     81        (WebKit::WebProcessProxy::addVisitedLinkProvider): Deleted.
     82        (WebKit::WebProcessProxy::didDestroyVisitedLinkProvider): Deleted.
     83        * UIProcess/WebProcessProxy.h:
     84        * WebKit2.xcodeproj/project.pbxproj:
     85        * WebProcess/WebPage/VisitedLinkTableController.cpp:
     86        (WebKit::VisitedLinkTableController::addVisitedLink):
     87
    1882015-08-24  Tim Horton  <timothy_horton@apple.com>
    289

  • trunk/Source/WebKit2/DerivedSources.make

    r185615 r188895  
    104104    ViewGestureGeometryCollector \
    105105    ViewUpdateDispatcher \
    106     VisitedLinkProvider \
     106    VisitedLinkStore \
    107107    VisitedLinkTableController \
    108108    WebConnection \

  • trunk/Source/WebKit2/Shared/API/APIObject.h

    r188553 r188895  
    146146        Vibration,
    147147        ViewportAttributes,
    148         VisitedLinkProvider,
     148        VisitedLinkStore,
    149149        WebsiteDataRecord,
    150150        WebsiteDataStore,

  • trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm

    r188891 r188895  
    207207        break;
    208208
    209     case Type::VisitedLinkProvider:
     209    case Type::VisitedLinkStore:
    210210        wrapper = [_WKVisitedLinkStore alloc];
    211211        break;

  • trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp

    r188543 r188895  
    6161    copy->m_preferenceValues = this->m_preferenceValues;
    6262    copy->m_relatedPage = this->m_relatedPage;
    63     copy->m_visitedLinkProvider = this->m_visitedLinkProvider;
     63    copy->m_visitedLinkStore = this->m_visitedLinkStore;
    6464    copy->m_websiteDataStore = this->m_websiteDataStore;
    6565    copy->m_sessionID = this->m_sessionID;
    … …  
    124124
    125125
    126 VisitedLinkProvider* PageConfiguration::visitedLinkProvider()
     126VisitedLinkStore* PageConfiguration::visitedLinkStore()
    127127{
    128     return m_visitedLinkProvider.get();
     128    return m_visitedLinkStore.get();
    129129}
    130130
    131 void PageConfiguration::setVisitedLinkProvider(VisitedLinkProvider* visitedLinkProvider)
     131void PageConfiguration::setVisitedLinkStore(VisitedLinkStore* visitedLinkStore)
    132132{
    133     m_visitedLinkProvider = visitedLinkProvider;
     133    m_visitedLinkStore = visitedLinkStore;
    134134}
    135135

  • trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h

    r188228 r188895  
    3333
    3434namespace WebKit {
    35 class VisitedLinkProvider;
     35class VisitedLinkStore;
    3636class WebPageGroup;
    3737class WebPageProxy;
    … …  
    7474    void setRelatedPage(WebKit::WebPageProxy*);
    7575
    76     WebKit::VisitedLinkProvider* visitedLinkProvider();
    77     void setVisitedLinkProvider(WebKit::VisitedLinkProvider*);
     76    WebKit::VisitedLinkStore* visitedLinkStore();
     77    void setVisitedLinkStore(WebKit::VisitedLinkStore*);
    7878
    7979    WebsiteDataStore* websiteDataStore();
    … …  
    9999    WebKit::WebPreferencesStore::ValueMap m_preferenceValues;
    100100    RefPtr<WebKit::WebPageProxy> m_relatedPage;
    101     RefPtr<WebKit::VisitedLinkProvider> m_visitedLinkProvider;
     101    RefPtr<WebKit::VisitedLinkStore> m_visitedLinkStore;
    102102
    103103    RefPtr<WebsiteDataStore> m_websiteDataStore;

  • trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

    r187917 r188895  
    312312        return;
    313313
    314     toImpl(contextRef)->visitedLinkProvider().addVisitedLinkHash(visitedLinkHash(visitedURLString));
     314    toImpl(contextRef)->visitedLinkStore().addVisitedLinkHash(visitedLinkHash(visitedURLString));
    315315}
    316316
    317317void WKContextClearVisitedLinks(WKContextRef contextRef)
    318318{
    319     toImpl(contextRef)->visitedLinkProvider().removeAll();
     319    toImpl(contextRef)->visitedLinkStore().removeAll();
    320320}
    321321

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r188891 r188895  
    311311
    312312    pageConfiguration->setUserContentController([_configuration userContentController]->_userContentControllerProxy.get());
    313     pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkStore]->_visitedLinkProvider.get());
     313    pageConfiguration->setVisitedLinkStore([_configuration _visitedLinkStore]->_visitedLinkStore.get());
    314314    pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
    315315    pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure([_configuration _treatsSHA1SignedCertificatesAsInsecure]);

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm

    r188891 r188895  
    2929#if WK_API_ENABLED
    3030
    31 #import "VisitedLinkProvider.h"
     31#import "VisitedLinkStore.h"
    3232#import <WebCore/LinkHash.h>
    3333
    … …  
    3939        return nil;
    4040
    41     API::Object::constructInWrapper<WebKit::VisitedLinkProvider>(self);
     41    API::Object::constructInWrapper<WebKit::VisitedLinkStore>(self);
    4242
    4343    return self;
    … …  
    4646- (void)dealloc
    4747{
    48     _visitedLinkProvider->~VisitedLinkProvider();
     48    _visitedLinkStore->~VisitedLinkStore();
    4949
    5050    [super dealloc];
    … …  
    5555    auto linkHash = WebCore::visitedLinkHash(URL.absoluteString);
    5656
    57     _visitedLinkProvider->addVisitedLinkHash(linkHash);
     57    _visitedLinkStore->addVisitedLinkHash(linkHash);
    5858}
    5959
    6060- (void)removeAll
    6161{
    62     _visitedLinkProvider->removeAll();
     62    _visitedLinkStore->removeAll();
    6363}
    6464
    … …  
    6767- (API::Object&)_apiObject
    6868{
    69     return *_visitedLinkProvider;
     69    return *_visitedLinkStore;
    7070}
    7171

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h

    r188891 r188895  
    2828#if WK_API_ENABLED
    2929
    30 #import "VisitedLinkProvider.h"
     30#import "VisitedLinkStore.h"
    3131#import "WKObject.h"
    3232
    3333namespace WebKit {
    3434
    35 inline _WKVisitedLinkStore *wrapper(VisitedLinkProvider& visitedLinkProvider)
     35inline _WKVisitedLinkStore *wrapper(VisitedLinkStore& visitedLinkStore)
    3636{
    37     ASSERT([visitedLinkProvider.wrapper() isKindOfClass:[_WKVisitedLinkStore class]]);
    38     return (_WKVisitedLinkStore *)visitedLinkProvider.wrapper();
     37    ASSERT([visitedLinkStore.wrapper() isKindOfClass:[_WKVisitedLinkStore class]]);
     38    return (_WKVisitedLinkStore *)visitedLinkStore.wrapper();
    3939}
    4040
    … …  
    4343@interface _WKVisitedLinkStore () <WKObject> {
    4444@package
    45     API::ObjectStorage<WebKit::VisitedLinkProvider> _visitedLinkProvider;
     45    API::ObjectStorage<WebKit::VisitedLinkStore> _visitedLinkStore;
    4646}
    4747

  • trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp

    r188893 r188895  
    2525
    2626#include "config.h"
    27 #include "VisitedLinkProvider.h"
     27#include "VisitedLinkStore.h"
    2828
    2929#include "SharedMemory.h"
    30 #include "VisitedLinkProviderMessages.h"
     30#include "VisitedLinkStoreMessages.h"
    3131#include "VisitedLinkTable.h"
    3232#include "VisitedLinkTableControllerMessages.h"
    … …  
    4848}
    4949
    50 Ref<VisitedLinkProvider> VisitedLinkProvider::create()
    51 {
    52     return adoptRef(*new VisitedLinkProvider);
    53 }
    54 
    55 VisitedLinkProvider::~VisitedLinkProvider()
     50Ref<VisitedLinkStore> VisitedLinkStore::create()
     51{
     52    return adoptRef(*new VisitedLinkStore);
     53}
     54
     55VisitedLinkStore::~VisitedLinkStore()
    5656{
    5757    for (WebProcessProxy* process : m_processes) {
    58         process->removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
    59         process->didDestroyVisitedLinkProvider(*this);
    60     }
    61 }
    62 
    63 VisitedLinkProvider::VisitedLinkProvider()
     58        process->removeMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier);
     59        process->didDestroyVisitedLinkStore(*this);
     60    }
     61}
     62
     63VisitedLinkStore::VisitedLinkStore()
    6464    : m_identifier(generateIdentifier())
    6565    , m_keyCount(0)
    6666    , m_tableSize(0)
    67     , m_pendingVisitedLinksTimer(RunLoop::main(), this, &VisitedLinkProvider::pendingVisitedLinksTimerFired)
    68 {
    69 }
    70 
    71 void VisitedLinkProvider::addProcess(WebProcessProxy& process)
     67    , m_pendingVisitedLinksTimer(RunLoop::main(), this, &VisitedLinkStore::pendingVisitedLinksTimerFired)
     68{
     69}
     70
     71void VisitedLinkStore::addProcess(WebProcessProxy& process)
    7272{
    7373    ASSERT(process.state() == WebProcessProxy::State::Running);
    … …  
    7676        return;
    7777
    78     process.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
     78    process.addMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier, *this);
    7979
    8080    if (!m_keyCount)
    … …  
    8686}
    8787
    88 void VisitedLinkProvider::removeProcess(WebProcessProxy& process)
     88void VisitedLinkStore::removeProcess(WebProcessProxy& process)
    8989{
    9090    ASSERT(m_processes.contains(&process));
    9191
    9292    m_processes.remove(&process);
    93     process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
    94 }
    95 
    96 void VisitedLinkProvider::addVisitedLinkHash(LinkHash linkHash)
     93    process.removeMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier);
     94}
     95
     96void VisitedLinkStore::addVisitedLinkHash(LinkHash linkHash)
    9797{
    9898    m_pendingVisitedLinks.add(linkHash);
    … …  
    102102}
    103103
    104 void VisitedLinkProvider::removeAll()
     104void VisitedLinkStore::removeAll()
    105105{
    106106    m_pendingVisitedLinksTimer.stop();
    … …  
    116116}
    117117
    118 void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
     118void VisitedLinkStore::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
    119119{
    120120    // FIXME: Implement.
    121121}
    122122
    123 void VisitedLinkProvider::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
     123void VisitedLinkStore::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
    124124{
    125125    // FIXME: Implement.
    126126}
    127127
    128 void VisitedLinkProvider::addVisitedLinkHashFromPage(uint64_t pageID, LinkHash linkHash)
     128void VisitedLinkStore::addVisitedLinkHashFromPage(uint64_t pageID, LinkHash linkHash)
    129129{
    130130    if (WebPageProxy* webPageProxy = WebProcessProxy::webPage(pageID)) {
    … …  
    165165}
    166166
    167 void VisitedLinkProvider::pendingVisitedLinksTimerFired()
     167void VisitedLinkStore::pendingVisitedLinksTimerFired()
    168168{
    169169    unsigned currentTableSize = m_tableSize;
    … …  
    201201}
    202202
    203 void VisitedLinkProvider::resizeTable(unsigned newTableSize)
     203void VisitedLinkStore::resizeTable(unsigned newTableSize)
    204204{
    205205    RefPtr<SharedMemory> newTableMemory = SharedMemory::allocate(newTableSize * sizeof(LinkHash));
    … …  
    246246}
    247247
    248 void VisitedLinkProvider::sendTable(WebProcessProxy& process)
     248void VisitedLinkStore::sendTable(WebProcessProxy& process)
    249249{
    250250    ASSERT(process.processPool().processes().contains(&process));

  • trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h

    r188893 r188895  
    2424 */
    2525
    26 #ifndef VisitedLinkProvider_h
    27 #define VisitedLinkProvider_h
     26#ifndef VisitedLinkStore_h
     27#define VisitedLinkStore_h
    2828
    2929#include "APIObject.h"
    … …  
    4242class WebProcessProxy;
    4343   
    44 class VisitedLinkProvider final : public API::ObjectImpl<API::Object::Type::VisitedLinkProvider>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
     44class VisitedLinkStore final : public API::ObjectImpl<API::Object::Type::VisitedLinkStore>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
    4545public:
    46     static Ref<VisitedLinkProvider> create();
     46    static Ref<VisitedLinkStore> create();
    4747
    48     explicit VisitedLinkProvider();
    49     virtual ~VisitedLinkProvider();
     48    explicit VisitedLinkStore();
     49    virtual ~VisitedLinkStore();
    5050
    5151    uint64_t identifier() const { return m_identifier; }
    … …  
    8181
    8282    HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_pendingVisitedLinks;
    83     RunLoop::Timer<VisitedLinkProvider> m_pendingVisitedLinksTimer;
     83    RunLoop::Timer<VisitedLinkStore> m_pendingVisitedLinksTimer;
    8484};
    8585
    8686} // namespace WebKit
    8787
    88 #endif // VisitedLinkProvider_h
     88#endif // VisitedLinkStore_h

  • trunk/Source/WebKit2/UIProcess/VisitedLinkStore.messages.in

    r188893 r188895  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 messages -> VisitedLinkProvider {
     23messages -> VisitedLinkStore {
    2424    AddVisitedLinkHashFromPage(uint64_t pageID, uint64_t linkHash)
    2525}

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r188793 r188895  
    318318    , m_preferences(*m_configuration->preferences())
    319319    , m_userContentController(m_configuration->userContentController())
    320     , m_visitedLinkProvider(*m_configuration->visitedLinkProvider())
     320    , m_visitedLinkStore(*m_configuration->visitedLinkStore())
    321321    , m_websiteDataStore(m_configuration->websiteDataStore()->websiteDataStore())
    322322    , m_mainFrame(nullptr)
    … …  
    443443    , m_viewStateChangeWantsSynchronousReply(false)
    444444{
    445     m_webProcessLifetimeTracker.addObserver(m_visitedLinkProvider);
     445    m_webProcessLifetimeTracker.addObserver(m_visitedLinkStore);
    446446    m_webProcessLifetimeTracker.addObserver(m_websiteDataStore);
    447447
    … …  
    449449        if (m_userContentController)
    450450            m_process->addWebUserContentControllerProxy(*m_userContentController);
    451         m_process->addVisitedLinkProvider(m_visitedLinkProvider);
     451        m_process->addVisitedLinkStore(m_visitedLinkStore);
    452452    }
    453453
    … …  
    36293629    if (m_userContentController)
    36303630        m_process->addWebUserContentControllerProxy(*m_userContentController);
    3631     m_process->addVisitedLinkProvider(m_visitedLinkProvider);
     3631    m_process->addVisitedLinkStore(m_visitedLinkStore);
    36323632}
    36333633
    … …  
    51735173    parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
    51745174    parameters.userContentControllerID = m_userContentController ? m_userContentController->identifier() : 0;
    5175     parameters.visitedLinkTableID = m_visitedLinkProvider->identifier();
     5175    parameters.visitedLinkTableID = m_visitedLinkStore->identifier();
    51765176    parameters.websiteDataStoreID = m_websiteDataStore->identifier();
    51775177    parameters.canRunBeforeUnloadConfirmPanel = m_uiClient->canRunBeforeUnloadConfirmPanel();

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r188793 r188895  
    184184class UserData;
    185185class ViewSnapshot;
    186 class VisitedLinkProvider;
     186class VisitedLinkStore;
    187187class WebBackForwardList;
    188188class WebBackForwardListItem;
    … …  
    15021502
    15031503    const RefPtr<WebUserContentControllerProxy> m_userContentController;
    1504     Ref<VisitedLinkProvider> m_visitedLinkProvider;
     1504    Ref<VisitedLinkStore> m_visitedLinkStore;
    15051505    Ref<WebsiteDataStore> m_websiteDataStore;
    15061506

  • trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

    r188793 r188895  
    147147    , m_downloadClient(std::make_unique<API::DownloadClient>())
    148148    , m_historyClient(std::make_unique<API::LegacyContextHistoryClient>())
    149     , m_visitedLinkProvider(VisitedLinkProvider::create())
     149    , m_visitedLinkStore(VisitedLinkStore::create())
    150150    , m_visitedLinksPopulated(false)
    151151    , m_plugInAutoStartProvider(this)
    … …  
    842842    if (!pageConfiguration->preferences())
    843843        pageConfiguration->setPreferences(&pageConfiguration->pageGroup()->preferences());
    844     if (!pageConfiguration->visitedLinkProvider())
    845         pageConfiguration->setVisitedLinkProvider(m_visitedLinkProvider.ptr());
     844    if (!pageConfiguration->visitedLinkStore())
     845        pageConfiguration->setVisitedLinkStore(m_visitedLinkStore.ptr());
    846846    if (!pageConfiguration->websiteDataStore()) {
    847847        ASSERT(!pageConfiguration->sessionID().isValid());

  • trunk/Source/WebKit2/UIProcess/WebProcessPool.h

    r188228 r188895  
    4040#include "ProcessThrottler.h"
    4141#include "StatisticsRequest.h"
    42 #include "VisitedLinkProvider.h"
     42#include "VisitedLinkStore.h"
    4343#include "WebContextClient.h"
    4444#include "WebContextConnectionClient.h"
    … …  
    214214#endif
    215215
    216     VisitedLinkProvider& visitedLinkProvider() { return m_visitedLinkProvider.get(); }
     216    VisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
    217217
    218218    void setCacheModel(CacheModel);
    … …  
    446446    PluginInfoStore m_pluginInfoStore;
    447447#endif
    448     Ref<VisitedLinkProvider> m_visitedLinkProvider;
     448    Ref<VisitedLinkStore> m_visitedLinkStore;
    449449    bool m_visitedLinksPopulated;
    450450

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r188228 r188895  
    191191        m_downloadProxyMap->processDidClose();
    192192
    193     for (VisitedLinkProvider* visitedLinkProvider : m_visitedLinkProviders)
    194         visitedLinkProvider->removeProcess(*this);
    195     m_visitedLinkProviders.clear();
     193    for (VisitedLinkStore* visitedLinkStore : m_visitedLinkStores)
     194        visitedLinkStore->removeProcess(*this);
     195    m_visitedLinkStores.clear();
    196196
    197197    for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
    … …  
    248248}
    249249
    250 void WebProcessProxy::addVisitedLinkProvider(VisitedLinkProvider& provider)
    251 {
    252     m_visitedLinkProviders.add(&provider);
    253     provider.addProcess(*this);
     250void WebProcessProxy::addVisitedLinkStore(VisitedLinkStore& store)
     251{
     252    m_visitedLinkStores.add(&store);
     253    store.addProcess(*this);
    254254}
    255255
    … …  
    260260}
    261261
    262 void WebProcessProxy::didDestroyVisitedLinkProvider(VisitedLinkProvider& provider)
    263 {
    264     ASSERT(m_visitedLinkProviders.contains(&provider));
    265     m_visitedLinkProviders.remove(&provider);
     262void WebProcessProxy::didDestroyVisitedLinkStore(VisitedLinkStore& store)
     263{
     264    ASSERT(m_visitedLinkStores.contains(&store));
     265    m_visitedLinkStores.remove(&store);
    266266}
    267267

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r188228 r188895  
    9292    unsigned pageCount() const { return m_pageMap.size(); }
    9393
    94     void addVisitedLinkProvider(VisitedLinkProvider&);
     94    void addVisitedLinkStore(VisitedLinkStore&);
    9595    void addWebUserContentControllerProxy(WebUserContentControllerProxy&);
    96     void didDestroyVisitedLinkProvider(VisitedLinkProvider&);
     96    void didDestroyVisitedLinkStore(VisitedLinkStore&);
    9797    void didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy&);
    9898
    … …  
    239239    WebBackForwardListItemMap m_backForwardListItemMap;
    240240
    241     HashSet<VisitedLinkProvider*> m_visitedLinkProviders;
     241    HashSet<VisitedLinkStore*> m_visitedLinkStores;
    242242    HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
    243243

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r188892 r188895  
    150150                1A0F29CB120B37160053D1B9 /* VisitedLinkTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */; };
    151151                1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */; };
    152                 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */; };
    153                 1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */; };
     152                1A0F29E3120B44420053D1B9 /* VisitedLinkStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */; };
     153                1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */; };
    154154                1A158419189044F50017616C /* WKProcessPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A158417189044F50017616C /* WKProcessPool.mm */; };
    155155                1A15841A189044F50017616C /* WKProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
    … …  
    273273                1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */; };
    274274                1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
    275                 1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */; };
    276                 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */; };
     275                1A60224C18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */; };
     276                1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */; };
    277277                1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
    278278                1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    22352235                1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTable.cpp; sourceTree = "<group>"; };
    22362236                1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTable.h; sourceTree = "<group>"; };
    2237                 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProvider.cpp; sourceTree = "<group>"; };
    2238                 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProvider.h; sourceTree = "<group>"; };
     2237                1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkStore.cpp; sourceTree = "<group>"; };
     2238                1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkStore.h; sourceTree = "<group>"; };
    22392239                1A158417189044F50017616C /* WKProcessPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPool.mm; sourceTree = "<group>"; };
    22402240                1A158418189044F50017616C /* WKProcessPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPool.h; sourceTree = "<group>"; };
    … …  
    23722372                1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
    23732373                1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerState.h; sourceTree = "<group>"; };
    2374                 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkProvider.messages.in; sourceTree = "<group>"; };
    2375                 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProviderMessageReceiver.cpp; sourceTree = "<group>"; };
    2376                 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProviderMessages.h; sourceTree = "<group>"; };
     2374                1A60224918C16B0800C3E8C9 /* VisitedLinkStore.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkStore.messages.in; sourceTree = "<group>"; };
     2375                1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkStoreMessageReceiver.cpp; sourceTree = "<group>"; };
     2376                1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkStoreMessages.h; sourceTree = "<group>"; };
    23772377                1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
    23782378                1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
    … …  
    61156115                                4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */,
    61166116                                2DAF4FFA1B636181006013D6 /* ViewGestureController.cpp */,
    6117                                 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */,
    6118                                 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
    6119                                 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */,
     6117                                1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */,
     6118                                1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */,
     6119                                1A60224918C16B0800C3E8C9 /* VisitedLinkStore.messages.in */,
    61206120                                BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
    61216121                                BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
    … …  
    72187218                                2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */,
    72197219                                2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */,
    7220                                 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */,
    7221                                 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */,
     7220                                1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */,
     7221                                1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */,
    72227222                                1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */,
    72237223                                1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */,
    … …  
    78917891                                2684055318B86ED60022C38B /* ViewUpdateDispatcherMessages.h in Headers */,
    78927892                                2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */,
    7893                                 1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */,
    7894                                 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */,
     7893                                1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */,
     7894                                1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */,
    78957895                                1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */,
    78967896                                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
    … …  
    97179717                                2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */,
    97189718                                2684054C18B86C350022C38B /* VisibleContentRectUpdateInfo.cpp in Sources */,
    9719                                 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */,
    9720                                 1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */,
     9719                                1A0F29E3120B44420053D1B9 /* VisitedLinkStore.cpp in Sources */,
     9720                                1A60224C18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp in Sources */,
    97219721                                1A0F29CB120B37160053D1B9 /* VisitedLinkTable.cpp in Sources */,
    97229722                                1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp

    r182760 r188895  
    2727#include "VisitedLinkTableController.h"
    2828
    29 #include "VisitedLinkProviderMessages.h"
     29#include "VisitedLinkStoreMessages.h"
    3030#include "VisitedLinkTableControllerMessages.h"
    3131#include "WebPage.h"
    … …  
    8686        return;
    8787
    88     WebProcess::singleton().parentProcessConnection()->send(Messages::VisitedLinkProvider::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
     88    WebProcess::singleton().parentProcessConnection()->send(Messages::VisitedLinkStore::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
    8989}
    9090
Note: See TracChangeset for help on using the changeset viewer.