Diff
Modified: trunk/Source/WebKit2/ChangeLog (188894 => 188895)
--- trunk/Source/WebKit2/ChangeLog 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-24 23:51:01 UTC (rev 188895)
@@ -1,3 +1,90 @@
+2015-08-24 Anders Carlsson <[email protected]>
+
+ 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):
+
2015-08-24 Tim Horton <[email protected]>
(Finally...) get rid of WKViewIOS
Modified: trunk/Source/WebKit2/DerivedSources.make (188894 => 188895)
--- trunk/Source/WebKit2/DerivedSources.make 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/DerivedSources.make 2015-08-24 23:51:01 UTC (rev 188895)
@@ -103,7 +103,7 @@
ViewGestureController \
ViewGestureGeometryCollector \
ViewUpdateDispatcher \
- VisitedLinkProvider \
+ VisitedLinkStore \
VisitedLinkTableController \
WebConnection \
WebCookieManager \
Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (188894 => 188895)
--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -145,7 +145,7 @@
UserMediaPermissionRequest,
Vibration,
ViewportAttributes,
- VisitedLinkProvider,
+ VisitedLinkStore,
WebsiteDataRecord,
WebsiteDataStore,
WindowFeatures,
Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (188894 => 188895)
--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-08-24 23:51:01 UTC (rev 188895)
@@ -206,7 +206,7 @@
wrapper = [WKUserScript alloc];
break;
- case Type::VisitedLinkProvider:
+ case Type::VisitedLinkStore:
wrapper = [_WKVisitedLinkStore alloc];
break;
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -60,7 +60,7 @@
copy->m_preferences = this->m_preferences;
copy->m_preferenceValues = this->m_preferenceValues;
copy->m_relatedPage = this->m_relatedPage;
- copy->m_visitedLinkProvider = this->m_visitedLinkProvider;
+ copy->m_visitedLinkStore = this->m_visitedLinkStore;
copy->m_websiteDataStore = this->m_websiteDataStore;
copy->m_sessionID = this->m_sessionID;
copy->m_treatsSHA1SignedCertificatesAsInsecure = this->m_treatsSHA1SignedCertificatesAsInsecure;
@@ -123,14 +123,14 @@
}
-VisitedLinkProvider* PageConfiguration::visitedLinkProvider()
+VisitedLinkStore* PageConfiguration::visitedLinkStore()
{
- return m_visitedLinkProvider.get();
+ return m_visitedLinkStore.get();
}
-void PageConfiguration::setVisitedLinkProvider(VisitedLinkProvider* visitedLinkProvider)
+void PageConfiguration::setVisitedLinkStore(VisitedLinkStore* visitedLinkStore)
{
- m_visitedLinkProvider = visitedLinkProvider;
+ m_visitedLinkStore = visitedLinkStore;
}
API::WebsiteDataStore* PageConfiguration::websiteDataStore()
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -32,7 +32,7 @@
#include <wtf/GetPtr.h>
namespace WebKit {
-class VisitedLinkProvider;
+class VisitedLinkStore;
class WebPageGroup;
class WebPageProxy;
class WebPreferences;
@@ -73,8 +73,8 @@
WebKit::WebPageProxy* relatedPage();
void setRelatedPage(WebKit::WebPageProxy*);
- WebKit::VisitedLinkProvider* visitedLinkProvider();
- void setVisitedLinkProvider(WebKit::VisitedLinkProvider*);
+ WebKit::VisitedLinkStore* visitedLinkStore();
+ void setVisitedLinkStore(WebKit::VisitedLinkStore*);
WebsiteDataStore* websiteDataStore();
void setWebsiteDataStore(WebsiteDataStore*);
@@ -98,7 +98,7 @@
RefPtr<WebKit::WebPreferences> m_preferences;
WebKit::WebPreferencesStore::ValueMap m_preferenceValues;
RefPtr<WebKit::WebPageProxy> m_relatedPage;
- RefPtr<WebKit::VisitedLinkProvider> m_visitedLinkProvider;
+ RefPtr<WebKit::VisitedLinkStore> m_visitedLinkStore;
RefPtr<WebsiteDataStore> m_websiteDataStore;
// FIXME: We currently have to pass the session ID separately here to support the legacy private browsing session.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -311,12 +311,12 @@
if (visitedURLString.isEmpty())
return;
- toImpl(contextRef)->visitedLinkProvider().addVisitedLinkHash(visitedLinkHash(visitedURLString));
+ toImpl(contextRef)->visitedLinkStore().addVisitedLinkHash(visitedLinkHash(visitedURLString));
}
void WKContextClearVisitedLinks(WKContextRef contextRef)
{
- toImpl(contextRef)->visitedLinkProvider().removeAll();
+ toImpl(contextRef)->visitedLinkStore().removeAll();
}
void WKContextSetCacheModel(WKContextRef contextRef, WKCacheModel cacheModel)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-08-24 23:51:01 UTC (rev 188895)
@@ -310,7 +310,7 @@
pageConfiguration->setRelatedPage(relatedWebView->_page.get());
pageConfiguration->setUserContentController([_configuration userContentController]->_userContentControllerProxy.get());
- pageConfiguration->setVisitedLinkProvider([_configuration _visitedLinkStore]->_visitedLinkProvider.get());
+ pageConfiguration->setVisitedLinkStore([_configuration _visitedLinkStore]->_visitedLinkStore.get());
pageConfiguration->setWebsiteDataStore([_configuration websiteDataStore]->_websiteDataStore.get());
pageConfiguration->setTreatsSHA1SignedCertificatesAsInsecure([_configuration _treatsSHA1SignedCertificatesAsInsecure]);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStore.mm 2015-08-24 23:51:01 UTC (rev 188895)
@@ -28,7 +28,7 @@
#if WK_API_ENABLED
-#import "VisitedLinkProvider.h"
+#import "VisitedLinkStore.h"
#import <WebCore/LinkHash.h>
@implementation _WKVisitedLinkStore
@@ -38,14 +38,14 @@
if (!(self = [super init]))
return nil;
- API::Object::constructInWrapper<WebKit::VisitedLinkProvider>(self);
+ API::Object::constructInWrapper<WebKit::VisitedLinkStore>(self);
return self;
}
- (void)dealloc
{
- _visitedLinkProvider->~VisitedLinkProvider();
+ _visitedLinkStore->~VisitedLinkStore();
[super dealloc];
}
@@ -54,19 +54,19 @@
{
auto linkHash = WebCore::visitedLinkHash(URL.absoluteString);
- _visitedLinkProvider->addVisitedLinkHash(linkHash);
+ _visitedLinkStore->addVisitedLinkHash(linkHash);
}
- (void)removeAll
{
- _visitedLinkProvider->removeAll();
+ _visitedLinkStore->removeAll();
}
#pragma mark WKObject protocol implementation
- (API::Object&)_apiObject
{
- return *_visitedLinkProvider;
+ return *_visitedLinkStore;
}
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKVisitedLinkStoreInternal.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -27,22 +27,22 @@
#if WK_API_ENABLED
-#import "VisitedLinkProvider.h"
+#import "VisitedLinkStore.h"
#import "WKObject.h"
namespace WebKit {
-inline _WKVisitedLinkStore *wrapper(VisitedLinkProvider& visitedLinkProvider)
+inline _WKVisitedLinkStore *wrapper(VisitedLinkStore& visitedLinkStore)
{
- ASSERT([visitedLinkProvider.wrapper() isKindOfClass:[_WKVisitedLinkStore class]]);
- return (_WKVisitedLinkStore *)visitedLinkProvider.wrapper();
+ ASSERT([visitedLinkStore.wrapper() isKindOfClass:[_WKVisitedLinkStore class]]);
+ return (_WKVisitedLinkStore *)visitedLinkStore.wrapper();
}
}
@interface _WKVisitedLinkStore () <WKObject> {
@package
- API::ObjectStorage<WebKit::VisitedLinkProvider> _visitedLinkProvider;
+ API::ObjectStorage<WebKit::VisitedLinkStore> _visitedLinkStore;
}
@end
Deleted: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -1,259 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#include "config.h"
-#include "VisitedLinkProvider.h"
-
-#include "SharedMemory.h"
-#include "VisitedLinkProviderMessages.h"
-#include "VisitedLinkTable.h"
-#include "VisitedLinkTableControllerMessages.h"
-#include "WebProcessMessages.h"
-#include "WebProcessPool.h"
-#include "WebProcessProxy.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-static const int visitedLinkTableMaxLoad = 2;
-
-static uint64_t generateIdentifier()
-{
- static uint64_t identifier;
-
- return ++identifier;
-}
-
-Ref<VisitedLinkProvider> VisitedLinkProvider::create()
-{
- return adoptRef(*new VisitedLinkProvider);
-}
-
-VisitedLinkProvider::~VisitedLinkProvider()
-{
- for (WebProcessProxy* process : m_processes) {
- process->removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
- process->didDestroyVisitedLinkProvider(*this);
- }
-}
-
-VisitedLinkProvider::VisitedLinkProvider()
- : m_identifier(generateIdentifier())
- , m_keyCount(0)
- , m_tableSize(0)
- , m_pendingVisitedLinksTimer(RunLoop::main(), this, &VisitedLinkProvider::pendingVisitedLinksTimerFired)
-{
-}
-
-void VisitedLinkProvider::addProcess(WebProcessProxy& process)
-{
- ASSERT(process.state() == WebProcessProxy::State::Running);
-
- if (!m_processes.add(&process).isNewEntry)
- return;
-
- process.addMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier, *this);
-
- if (!m_keyCount)
- return;
-
- ASSERT(m_table.sharedMemory());
-
- sendTable(process);
-}
-
-void VisitedLinkProvider::removeProcess(WebProcessProxy& process)
-{
- ASSERT(m_processes.contains(&process));
-
- m_processes.remove(&process);
- process.removeMessageReceiver(Messages::VisitedLinkProvider::messageReceiverName(), m_identifier);
-}
-
-void VisitedLinkProvider::addVisitedLinkHash(LinkHash linkHash)
-{
- m_pendingVisitedLinks.add(linkHash);
-
- if (!m_pendingVisitedLinksTimer.isActive())
- m_pendingVisitedLinksTimer.startOneShot(0);
-}
-
-void VisitedLinkProvider::removeAll()
-{
- m_pendingVisitedLinksTimer.stop();
- m_pendingVisitedLinks.clear();
- m_keyCount = 0;
- m_tableSize = 0;
- m_table.clear();
-
- for (WebProcessProxy* process : m_processes) {
- ASSERT(process->processPool().processes().contains(process));
- process->connection()->send(Messages::VisitedLinkTableController::RemoveAllVisitedLinks(), m_identifier);
- }
-}
-
-void VisitedLinkProvider::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
-{
- // FIXME: Implement.
-}
-
-void VisitedLinkProvider::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
-{
- // FIXME: Implement.
-}
-
-void VisitedLinkProvider::addVisitedLinkHashFromPage(uint64_t pageID, LinkHash linkHash)
-{
- if (WebPageProxy* webPageProxy = WebProcessProxy::webPage(pageID)) {
- if (!webPageProxy->addsVisitedLinks())
- return;
- }
-
- addVisitedLinkHash(linkHash);
-}
-
-static unsigned nextPowerOf2(unsigned v)
-{
- // Taken from http://www.cs.utk.edu/~vose/c-stuff/bithacks.html
- // Devised by Sean Anderson, Sepember 14, 2001
-
- v--;
- v |= v >> 1;
- v |= v >> 2;
- v |= v >> 4;
- v |= v >> 8;
- v |= v >> 16;
- v++;
-
- return v;
-}
-
-static unsigned tableSizeForKeyCount(unsigned keyCount)
-{
- // We want the table to be at least half empty.
- unsigned tableSize = nextPowerOf2(keyCount * visitedLinkTableMaxLoad);
-
- // Ensure that the table size is at least the size of a page.
- size_t minimumTableSize = SharedMemory::systemPageSize() / sizeof(LinkHash);
- if (tableSize < minimumTableSize)
- return minimumTableSize;
-
- return tableSize;
-}
-
-void VisitedLinkProvider::pendingVisitedLinksTimerFired()
-{
- unsigned currentTableSize = m_tableSize;
- unsigned newTableSize = tableSizeForKeyCount(m_keyCount + m_pendingVisitedLinks.size());
-
- newTableSize = std::max(currentTableSize, newTableSize);
-
- if (currentTableSize != newTableSize) {
- resizeTable(newTableSize);
- return;
- }
-
- Vector<WebCore::LinkHash> addedVisitedLinks;
-
- for (auto linkHash : m_pendingVisitedLinks) {
- if (m_table.addLinkHash(linkHash)) {
- addedVisitedLinks.append(linkHash);
- m_keyCount++;
- }
- }
-
- m_pendingVisitedLinks.clear();
-
- if (addedVisitedLinks.isEmpty())
- return;
-
- for (WebProcessProxy* process : m_processes) {
- ASSERT(process->processPool().processes().contains(process));
-
- if (addedVisitedLinks.size() > 20)
- process->connection()->send(Messages::VisitedLinkTableController::AllVisitedLinkStateChanged(), m_identifier);
- else
- process->connection()->send(Messages::VisitedLinkTableController::VisitedLinkStateChanged(addedVisitedLinks), m_identifier);
- }
-}
-
-void VisitedLinkProvider::resizeTable(unsigned newTableSize)
-{
- RefPtr<SharedMemory> newTableMemory = SharedMemory::allocate(newTableSize * sizeof(LinkHash));
-
- if (!newTableMemory) {
- LOG_ERROR("Could not allocate shared memory for visited link table");
- return;
- }
-
- memset(newTableMemory->data(), 0, newTableMemory->size());
-
- RefPtr<SharedMemory> currentTableMemory = m_table.sharedMemory();
- unsigned currentTableSize = m_tableSize;
-
- m_table.setSharedMemory(newTableMemory);
- m_tableSize = newTableSize;
-
- if (currentTableMemory) {
- ASSERT_UNUSED(currentTableSize, currentTableMemory->size() == currentTableSize * sizeof(LinkHash));
-
- // Go through the current hash table and re-add all entries to the new hash table.
- const LinkHash* currentLinkHashes = static_cast<const LinkHash*>(currentTableMemory->data());
- for (unsigned i = 0; i < currentTableSize; ++i) {
- LinkHash linkHash = currentLinkHashes[i];
-
- if (!linkHash)
- continue;
-
- bool didAddLinkHash = m_table.addLinkHash(linkHash);
-
- // It should always be possible to add the link hash to a new table.
- ASSERT_UNUSED(didAddLinkHash, didAddLinkHash);
- }
- }
-
- for (auto linkHash : m_pendingVisitedLinks) {
- if (m_table.addLinkHash(linkHash))
- m_keyCount++;
- }
- m_pendingVisitedLinks.clear();
-
- for (WebProcessProxy* process : m_processes)
- sendTable(*process);
-}
-
-void VisitedLinkProvider::sendTable(WebProcessProxy& process)
-{
- ASSERT(process.processPool().processes().contains(&process));
-
- SharedMemory::Handle handle;
- if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::Protection::ReadOnly))
- return;
-
- process.connection()->send(Messages::VisitedLinkTableController::SetVisitedLinkTable(handle), m_identifier);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef VisitedLinkProvider_h
-#define VisitedLinkProvider_h
-
-#include "APIObject.h"
-#include "MessageReceiver.h"
-#include "VisitedLinkTable.h"
-#include "WebProcessLifetimeObserver.h"
-#include <WebCore/LinkHash.h>
-#include <wtf/Forward.h>
-#include <wtf/HashSet.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RunLoop.h>
-
-namespace WebKit {
-
-class WebPageProxy;
-class WebProcessProxy;
-
-class VisitedLinkProvider final : public API::ObjectImpl<API::Object::Type::VisitedLinkProvider>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
-public:
- static Ref<VisitedLinkProvider> create();
-
- explicit VisitedLinkProvider();
- virtual ~VisitedLinkProvider();
-
- uint64_t identifier() const { return m_identifier; }
-
- void addProcess(WebProcessProxy&);
- void removeProcess(WebProcessProxy&);
-
- void addVisitedLinkHash(WebCore::LinkHash);
- void removeAll();
-
-private:
- // IPC::MessageReceiver
- virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
-
- // WebProcessLifetimeObserver
- virtual void webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&) override;
- virtual void webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&) override;
-
- void addVisitedLinkHashFromPage(uint64_t pageID, WebCore::LinkHash);
-
- void pendingVisitedLinksTimerFired();
-
- void resizeTable(unsigned newTableSize);
- void sendTable(WebProcessProxy&);
-
- HashSet<WebProcessProxy*> m_processes;
-
- uint64_t m_identifier;
-
- unsigned m_keyCount;
- unsigned m_tableSize;
- VisitedLinkTable m_table;
-
- HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_pendingVisitedLinks;
- RunLoop::Timer<VisitedLinkProvider> m_pendingVisitedLinksTimer;
-};
-
-} // namespace WebKit
-
-#endif // VisitedLinkProvider_h
Deleted: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in 2015-08-24 23:51:01 UTC (rev 188895)
@@ -1,25 +0,0 @@
-# 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.
-
-messages -> VisitedLinkProvider {
- AddVisitedLinkHashFromPage(uint64_t pageID, uint64_t linkHash)
-}
Copied: trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp (from rev 188893, trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp) (0 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkStore.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#include "config.h"
+#include "VisitedLinkStore.h"
+
+#include "SharedMemory.h"
+#include "VisitedLinkStoreMessages.h"
+#include "VisitedLinkTable.h"
+#include "VisitedLinkTableControllerMessages.h"
+#include "WebProcessMessages.h"
+#include "WebProcessPool.h"
+#include "WebProcessProxy.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+static const int visitedLinkTableMaxLoad = 2;
+
+static uint64_t generateIdentifier()
+{
+ static uint64_t identifier;
+
+ return ++identifier;
+}
+
+Ref<VisitedLinkStore> VisitedLinkStore::create()
+{
+ return adoptRef(*new VisitedLinkStore);
+}
+
+VisitedLinkStore::~VisitedLinkStore()
+{
+ for (WebProcessProxy* process : m_processes) {
+ process->removeMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier);
+ process->didDestroyVisitedLinkStore(*this);
+ }
+}
+
+VisitedLinkStore::VisitedLinkStore()
+ : m_identifier(generateIdentifier())
+ , m_keyCount(0)
+ , m_tableSize(0)
+ , m_pendingVisitedLinksTimer(RunLoop::main(), this, &VisitedLinkStore::pendingVisitedLinksTimerFired)
+{
+}
+
+void VisitedLinkStore::addProcess(WebProcessProxy& process)
+{
+ ASSERT(process.state() == WebProcessProxy::State::Running);
+
+ if (!m_processes.add(&process).isNewEntry)
+ return;
+
+ process.addMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier, *this);
+
+ if (!m_keyCount)
+ return;
+
+ ASSERT(m_table.sharedMemory());
+
+ sendTable(process);
+}
+
+void VisitedLinkStore::removeProcess(WebProcessProxy& process)
+{
+ ASSERT(m_processes.contains(&process));
+
+ m_processes.remove(&process);
+ process.removeMessageReceiver(Messages::VisitedLinkStore::messageReceiverName(), m_identifier);
+}
+
+void VisitedLinkStore::addVisitedLinkHash(LinkHash linkHash)
+{
+ m_pendingVisitedLinks.add(linkHash);
+
+ if (!m_pendingVisitedLinksTimer.isActive())
+ m_pendingVisitedLinksTimer.startOneShot(0);
+}
+
+void VisitedLinkStore::removeAll()
+{
+ m_pendingVisitedLinksTimer.stop();
+ m_pendingVisitedLinks.clear();
+ m_keyCount = 0;
+ m_tableSize = 0;
+ m_table.clear();
+
+ for (WebProcessProxy* process : m_processes) {
+ ASSERT(process->processPool().processes().contains(process));
+ process->connection()->send(Messages::VisitedLinkTableController::RemoveAllVisitedLinks(), m_identifier);
+ }
+}
+
+void VisitedLinkStore::webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&)
+{
+ // FIXME: Implement.
+}
+
+void VisitedLinkStore::webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&)
+{
+ // FIXME: Implement.
+}
+
+void VisitedLinkStore::addVisitedLinkHashFromPage(uint64_t pageID, LinkHash linkHash)
+{
+ if (WebPageProxy* webPageProxy = WebProcessProxy::webPage(pageID)) {
+ if (!webPageProxy->addsVisitedLinks())
+ return;
+ }
+
+ addVisitedLinkHash(linkHash);
+}
+
+static unsigned nextPowerOf2(unsigned v)
+{
+ // Taken from http://www.cs.utk.edu/~vose/c-stuff/bithacks.html
+ // Devised by Sean Anderson, Sepember 14, 2001
+
+ v--;
+ v |= v >> 1;
+ v |= v >> 2;
+ v |= v >> 4;
+ v |= v >> 8;
+ v |= v >> 16;
+ v++;
+
+ return v;
+}
+
+static unsigned tableSizeForKeyCount(unsigned keyCount)
+{
+ // We want the table to be at least half empty.
+ unsigned tableSize = nextPowerOf2(keyCount * visitedLinkTableMaxLoad);
+
+ // Ensure that the table size is at least the size of a page.
+ size_t minimumTableSize = SharedMemory::systemPageSize() / sizeof(LinkHash);
+ if (tableSize < minimumTableSize)
+ return minimumTableSize;
+
+ return tableSize;
+}
+
+void VisitedLinkStore::pendingVisitedLinksTimerFired()
+{
+ unsigned currentTableSize = m_tableSize;
+ unsigned newTableSize = tableSizeForKeyCount(m_keyCount + m_pendingVisitedLinks.size());
+
+ newTableSize = std::max(currentTableSize, newTableSize);
+
+ if (currentTableSize != newTableSize) {
+ resizeTable(newTableSize);
+ return;
+ }
+
+ Vector<WebCore::LinkHash> addedVisitedLinks;
+
+ for (auto linkHash : m_pendingVisitedLinks) {
+ if (m_table.addLinkHash(linkHash)) {
+ addedVisitedLinks.append(linkHash);
+ m_keyCount++;
+ }
+ }
+
+ m_pendingVisitedLinks.clear();
+
+ if (addedVisitedLinks.isEmpty())
+ return;
+
+ for (WebProcessProxy* process : m_processes) {
+ ASSERT(process->processPool().processes().contains(process));
+
+ if (addedVisitedLinks.size() > 20)
+ process->connection()->send(Messages::VisitedLinkTableController::AllVisitedLinkStateChanged(), m_identifier);
+ else
+ process->connection()->send(Messages::VisitedLinkTableController::VisitedLinkStateChanged(addedVisitedLinks), m_identifier);
+ }
+}
+
+void VisitedLinkStore::resizeTable(unsigned newTableSize)
+{
+ RefPtr<SharedMemory> newTableMemory = SharedMemory::allocate(newTableSize * sizeof(LinkHash));
+
+ if (!newTableMemory) {
+ LOG_ERROR("Could not allocate shared memory for visited link table");
+ return;
+ }
+
+ memset(newTableMemory->data(), 0, newTableMemory->size());
+
+ RefPtr<SharedMemory> currentTableMemory = m_table.sharedMemory();
+ unsigned currentTableSize = m_tableSize;
+
+ m_table.setSharedMemory(newTableMemory);
+ m_tableSize = newTableSize;
+
+ if (currentTableMemory) {
+ ASSERT_UNUSED(currentTableSize, currentTableMemory->size() == currentTableSize * sizeof(LinkHash));
+
+ // Go through the current hash table and re-add all entries to the new hash table.
+ const LinkHash* currentLinkHashes = static_cast<const LinkHash*>(currentTableMemory->data());
+ for (unsigned i = 0; i < currentTableSize; ++i) {
+ LinkHash linkHash = currentLinkHashes[i];
+
+ if (!linkHash)
+ continue;
+
+ bool didAddLinkHash = m_table.addLinkHash(linkHash);
+
+ // It should always be possible to add the link hash to a new table.
+ ASSERT_UNUSED(didAddLinkHash, didAddLinkHash);
+ }
+ }
+
+ for (auto linkHash : m_pendingVisitedLinks) {
+ if (m_table.addLinkHash(linkHash))
+ m_keyCount++;
+ }
+ m_pendingVisitedLinks.clear();
+
+ for (WebProcessProxy* process : m_processes)
+ sendTable(*process);
+}
+
+void VisitedLinkStore::sendTable(WebProcessProxy& process)
+{
+ ASSERT(process.processPool().processes().contains(&process));
+
+ SharedMemory::Handle handle;
+ if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::Protection::ReadOnly))
+ return;
+
+ process.connection()->send(Messages::VisitedLinkTableController::SetVisitedLinkTable(handle), m_identifier);
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h (from rev 188893, trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.h) (0 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkStore.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+
+#ifndef VisitedLinkStore_h
+#define VisitedLinkStore_h
+
+#include "APIObject.h"
+#include "MessageReceiver.h"
+#include "VisitedLinkTable.h"
+#include "WebProcessLifetimeObserver.h"
+#include <WebCore/LinkHash.h>
+#include <wtf/Forward.h>
+#include <wtf/HashSet.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RunLoop.h>
+
+namespace WebKit {
+
+class WebPageProxy;
+class WebProcessProxy;
+
+class VisitedLinkStore final : public API::ObjectImpl<API::Object::Type::VisitedLinkStore>, private IPC::MessageReceiver, public WebProcessLifetimeObserver {
+public:
+ static Ref<VisitedLinkStore> create();
+
+ explicit VisitedLinkStore();
+ virtual ~VisitedLinkStore();
+
+ uint64_t identifier() const { return m_identifier; }
+
+ void addProcess(WebProcessProxy&);
+ void removeProcess(WebProcessProxy&);
+
+ void addVisitedLinkHash(WebCore::LinkHash);
+ void removeAll();
+
+private:
+ // IPC::MessageReceiver
+ virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+
+ // WebProcessLifetimeObserver
+ virtual void webProcessWillOpenConnection(WebProcessProxy&, IPC::Connection&) override;
+ virtual void webProcessDidCloseConnection(WebProcessProxy&, IPC::Connection&) override;
+
+ void addVisitedLinkHashFromPage(uint64_t pageID, WebCore::LinkHash);
+
+ void pendingVisitedLinksTimerFired();
+
+ void resizeTable(unsigned newTableSize);
+ void sendTable(WebProcessProxy&);
+
+ HashSet<WebProcessProxy*> m_processes;
+
+ uint64_t m_identifier;
+
+ unsigned m_keyCount;
+ unsigned m_tableSize;
+ VisitedLinkTable m_table;
+
+ HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_pendingVisitedLinks;
+ RunLoop::Timer<VisitedLinkStore> m_pendingVisitedLinksTimer;
+};
+
+} // namespace WebKit
+
+#endif // VisitedLinkStore_h
Copied: trunk/Source/WebKit2/UIProcess/VisitedLinkStore.messages.in (from rev 188893, trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.messages.in) (0 => 188895)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkStore.messages.in (rev 0)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkStore.messages.in 2015-08-24 23:51:01 UTC (rev 188895)
@@ -0,0 +1,25 @@
+# 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.
+
+messages -> VisitedLinkStore {
+ AddVisitedLinkHashFromPage(uint64_t pageID, uint64_t linkHash)
+}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -317,7 +317,7 @@
, m_pageGroup(*m_configuration->pageGroup())
, m_preferences(*m_configuration->preferences())
, m_userContentController(m_configuration->userContentController())
- , m_visitedLinkProvider(*m_configuration->visitedLinkProvider())
+ , m_visitedLinkStore(*m_configuration->visitedLinkStore())
, m_websiteDataStore(m_configuration->websiteDataStore()->websiteDataStore())
, m_mainFrame(nullptr)
, m_userAgent(standardUserAgent())
@@ -442,13 +442,13 @@
, m_potentiallyChangedViewStateFlags(ViewState::NoFlags)
, m_viewStateChangeWantsSynchronousReply(false)
{
- m_webProcessLifetimeTracker.addObserver(m_visitedLinkProvider);
+ m_webProcessLifetimeTracker.addObserver(m_visitedLinkStore);
m_webProcessLifetimeTracker.addObserver(m_websiteDataStore);
if (m_process->state() == WebProcessProxy::State::Running) {
if (m_userContentController)
m_process->addWebUserContentControllerProxy(*m_userContentController);
- m_process->addVisitedLinkProvider(m_visitedLinkProvider);
+ m_process->addVisitedLinkStore(m_visitedLinkStore);
}
updateViewState();
@@ -3628,7 +3628,7 @@
if (m_userContentController)
m_process->addWebUserContentControllerProxy(*m_userContentController);
- m_process->addVisitedLinkProvider(m_visitedLinkProvider);
+ m_process->addVisitedLinkStore(m_visitedLinkStore);
}
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -5172,7 +5172,7 @@
parameters.sessionID = m_sessionID;
parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
parameters.userContentControllerID = m_userContentController ? m_userContentController->identifier() : 0;
- parameters.visitedLinkTableID = m_visitedLinkProvider->identifier();
+ parameters.visitedLinkTableID = m_visitedLinkStore->identifier();
parameters.websiteDataStoreID = m_websiteDataStore->identifier();
parameters.canRunBeforeUnloadConfirmPanel = m_uiClient->canRunBeforeUnloadConfirmPanel();
parameters.canRunModal = m_canRunModal;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -183,7 +183,7 @@
class StringPairVector;
class UserData;
class ViewSnapshot;
-class VisitedLinkProvider;
+class VisitedLinkStore;
class WebBackForwardList;
class WebBackForwardListItem;
class WebContextMenuProxy;
@@ -1501,7 +1501,7 @@
WebProcessLifetimeTracker m_webProcessLifetimeTracker { *this };
const RefPtr<WebUserContentControllerProxy> m_userContentController;
- Ref<VisitedLinkProvider> m_visitedLinkProvider;
+ Ref<VisitedLinkStore> m_visitedLinkStore;
Ref<WebsiteDataStore> m_websiteDataStore;
RefPtr<WebFrameProxy> m_mainFrame;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -146,7 +146,7 @@
, m_defaultPageGroup(WebPageGroup::createNonNull())
, m_downloadClient(std::make_unique<API::DownloadClient>())
, m_historyClient(std::make_unique<API::LegacyContextHistoryClient>())
- , m_visitedLinkProvider(VisitedLinkProvider::create())
+ , m_visitedLinkStore(VisitedLinkStore::create())
, m_visitedLinksPopulated(false)
, m_plugInAutoStartProvider(this)
, m_alwaysUsesComplexTextCodePath(false)
@@ -841,8 +841,8 @@
pageConfiguration->setPageGroup(m_defaultPageGroup.ptr());
if (!pageConfiguration->preferences())
pageConfiguration->setPreferences(&pageConfiguration->pageGroup()->preferences());
- if (!pageConfiguration->visitedLinkProvider())
- pageConfiguration->setVisitedLinkProvider(m_visitedLinkProvider.ptr());
+ if (!pageConfiguration->visitedLinkStore())
+ pageConfiguration->setVisitedLinkStore(m_visitedLinkStore.ptr());
if (!pageConfiguration->websiteDataStore()) {
ASSERT(!pageConfiguration->sessionID().isValid());
pageConfiguration->setWebsiteDataStore(m_websiteDataStore.get());
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -39,7 +39,7 @@
#include "ProcessModel.h"
#include "ProcessThrottler.h"
#include "StatisticsRequest.h"
-#include "VisitedLinkProvider.h"
+#include "VisitedLinkStore.h"
#include "WebContextClient.h"
#include "WebContextConnectionClient.h"
#include "WebContextInjectedBundleClient.h"
@@ -213,7 +213,7 @@
void registerURLSchemeAsCachePartitioned(const String&);
#endif
- VisitedLinkProvider& visitedLinkProvider() { return m_visitedLinkProvider.get(); }
+ VisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
void setCacheModel(CacheModel);
CacheModel cacheModel() const { return m_configuration->cacheModel(); }
@@ -445,7 +445,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
PluginInfoStore m_pluginInfoStore;
#endif
- Ref<VisitedLinkProvider> m_visitedLinkProvider;
+ Ref<VisitedLinkStore> m_visitedLinkStore;
bool m_visitedLinksPopulated;
PlugInAutoStartProvider m_plugInAutoStartProvider;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -190,9 +190,9 @@
if (m_downloadProxyMap)
m_downloadProxyMap->processDidClose();
- for (VisitedLinkProvider* visitedLinkProvider : m_visitedLinkProviders)
- visitedLinkProvider->removeProcess(*this);
- m_visitedLinkProviders.clear();
+ for (VisitedLinkStore* visitedLinkStore : m_visitedLinkStores)
+ visitedLinkStore->removeProcess(*this);
+ m_visitedLinkStores.clear();
for (WebUserContentControllerProxy* webUserContentControllerProxy : m_webUserContentControllerProxies)
webUserContentControllerProxy->removeProcess(*this);
@@ -247,10 +247,10 @@
shutDown();
}
-void WebProcessProxy::addVisitedLinkProvider(VisitedLinkProvider& provider)
+void WebProcessProxy::addVisitedLinkStore(VisitedLinkStore& store)
{
- m_visitedLinkProviders.add(&provider);
- provider.addProcess(*this);
+ m_visitedLinkStores.add(&store);
+ store.addProcess(*this);
}
void WebProcessProxy::addWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
@@ -259,10 +259,10 @@
proxy.addProcess(*this);
}
-void WebProcessProxy::didDestroyVisitedLinkProvider(VisitedLinkProvider& provider)
+void WebProcessProxy::didDestroyVisitedLinkStore(VisitedLinkStore& store)
{
- ASSERT(m_visitedLinkProviders.contains(&provider));
- m_visitedLinkProviders.remove(&provider);
+ ASSERT(m_visitedLinkStores.contains(&store));
+ m_visitedLinkStores.remove(&store);
}
void WebProcessProxy::didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy& proxy)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (188894 => 188895)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-08-24 23:51:01 UTC (rev 188895)
@@ -91,9 +91,9 @@
WTF::IteratorRange<WebPageProxyMap::const_iterator::Values> pages() const { return m_pageMap.values(); }
unsigned pageCount() const { return m_pageMap.size(); }
- void addVisitedLinkProvider(VisitedLinkProvider&);
+ void addVisitedLinkStore(VisitedLinkStore&);
void addWebUserContentControllerProxy(WebUserContentControllerProxy&);
- void didDestroyVisitedLinkProvider(VisitedLinkProvider&);
+ void didDestroyVisitedLinkStore(VisitedLinkStore&);
void didDestroyWebUserContentControllerProxy(WebUserContentControllerProxy&);
WebBackForwardListItem* webBackForwardItem(uint64_t itemID) const;
@@ -238,7 +238,7 @@
WebFrameProxyMap m_frameMap;
WebBackForwardListItemMap m_backForwardListItemMap;
- HashSet<VisitedLinkProvider*> m_visitedLinkProviders;
+ HashSet<VisitedLinkStore*> m_visitedLinkStores;
HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (188894 => 188895)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-08-24 23:51:01 UTC (rev 188895)
@@ -149,8 +149,8 @@
1A0EC910124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0EC90E124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp */; };
1A0F29CB120B37160053D1B9 /* VisitedLinkTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */; };
1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */; };
- 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */; };
- 1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */; };
+ 1A0F29E3120B44420053D1B9 /* VisitedLinkStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */; };
+ 1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */; };
1A158419189044F50017616C /* WKProcessPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A158417189044F50017616C /* WKProcessPool.mm */; };
1A15841A189044F50017616C /* WKProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */; };
@@ -272,8 +272,8 @@
1A5B1C5418987EDF004FCF9B /* WebDocumentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */; };
1A5B1C5518987EDF004FCF9B /* WebDocumentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */; };
1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */; };
- 1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */; };
- 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */; };
+ 1A60224C18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */; };
+ 1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */; };
1A6280C51919949F006AD9F9 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C41919949F006AD9F9 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
1A6280C71919950C006AD9F9 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6280C61919950C006AD9F9 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A6280F019199800006AD9F9 /* WebKit2.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6280EE19199800006AD9F9 /* WebKit2.m */; };
@@ -2234,8 +2234,8 @@
1A0EC90E124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessConnectionManager.cpp; sourceTree = "<group>"; };
1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTable.cpp; sourceTree = "<group>"; };
1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTable.h; sourceTree = "<group>"; };
- 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProvider.cpp; sourceTree = "<group>"; };
- 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProvider.h; sourceTree = "<group>"; };
+ 1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkStore.cpp; sourceTree = "<group>"; };
+ 1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkStore.h; sourceTree = "<group>"; };
1A158417189044F50017616C /* WKProcessPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPool.mm; sourceTree = "<group>"; };
1A158418189044F50017616C /* WKProcessPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPool.h; sourceTree = "<group>"; };
1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
@@ -2371,9 +2371,9 @@
1A5B1C5218987EDF004FCF9B /* WebDocumentLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebDocumentLoader.cpp; sourceTree = "<group>"; };
1A5B1C5318987EDF004FCF9B /* WebDocumentLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDocumentLoader.h; sourceTree = "<group>"; };
1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerState.h; sourceTree = "<group>"; };
- 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkProvider.messages.in; sourceTree = "<group>"; };
- 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProviderMessageReceiver.cpp; sourceTree = "<group>"; };
- 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProviderMessages.h; sourceTree = "<group>"; };
+ 1A60224918C16B0800C3E8C9 /* VisitedLinkStore.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = VisitedLinkStore.messages.in; sourceTree = "<group>"; };
+ 1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkStoreMessageReceiver.cpp; sourceTree = "<group>"; };
+ 1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkStoreMessages.h; sourceTree = "<group>"; };
1A6280C41919949F006AD9F9 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; };
1A6280C61919950C006AD9F9 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; };
1A6280D0191997BD006AD9F9 /* WebKit2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -6114,9 +6114,9 @@
4A410F3B19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.cpp */,
4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */,
2DAF4FFA1B636181006013D6 /* ViewGestureController.cpp */,
- 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */,
- 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */,
- 1A60224918C16B0800C3E8C9 /* VisitedLinkProvider.messages.in */,
+ 1A0F29E1120B44420053D1B9 /* VisitedLinkStore.cpp */,
+ 1A0F29E2120B44420053D1B9 /* VisitedLinkStore.h */,
+ 1A60224918C16B0800C3E8C9 /* VisitedLinkStore.messages.in */,
BC72BA1B11E64907001EB4EA /* WebBackForwardList.cpp */,
BC72BA1C11E64907001EB4EA /* WebBackForwardList.h */,
F036978715F4BF0500C3A80E /* WebColorPicker.cpp */,
@@ -7217,8 +7217,8 @@
2D819BA01862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h */,
2684055018B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp */,
2684055118B86ED60022C38B /* ViewUpdateDispatcherMessages.h */,
- 1A60224A18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp */,
- 1A60224B18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h */,
+ 1A60224A18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp */,
+ 1A60224B18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h */,
1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */,
1A8E7D3B18C15149005A702A /* VisitedLinkTableControllerMessages.h */,
1A1FEC1A1627B45600700F6D /* WebConnectionMessageReceiver.cpp */,
@@ -7890,8 +7890,8 @@
2D6CD119189058A500E5A4A0 /* ViewSnapshotStore.h in Headers */,
2684055318B86ED60022C38B /* ViewUpdateDispatcherMessages.h in Headers */,
2684054418B85A630022C38B /* VisibleContentRectUpdateInfo.h in Headers */,
- 1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */,
- 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */,
+ 1A0F29E4120B44420053D1B9 /* VisitedLinkStore.h in Headers */,
+ 1A60224D18C16B9F00C3E8C9 /* VisitedLinkStoreMessages.h in Headers */,
1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */,
1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
@@ -9716,8 +9716,8 @@
2684054F18B86C8E0022C38B /* ViewUpdateDispatcher.cpp in Sources */,
2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */,
2684054C18B86C350022C38B /* VisibleContentRectUpdateInfo.cpp in Sources */,
- 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */,
- 1A60224C18C16B9F00C3E8C9 /* VisitedLinkProviderMessageReceiver.cpp in Sources */,
+ 1A0F29E3120B44420053D1B9 /* VisitedLinkStore.cpp in Sources */,
+ 1A60224C18C16B9F00C3E8C9 /* VisitedLinkStoreMessageReceiver.cpp in Sources */,
1A0F29CB120B37160053D1B9 /* VisitedLinkTable.cpp in Sources */,
1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */,
1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (188894 => 188895)
--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-08-24 23:48:55 UTC (rev 188894)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-08-24 23:51:01 UTC (rev 188895)
@@ -26,7 +26,7 @@
#include "config.h"
#include "VisitedLinkTableController.h"
-#include "VisitedLinkProviderMessages.h"
+#include "VisitedLinkStoreMessages.h"
#include "VisitedLinkTableControllerMessages.h"
#include "WebPage.h"
#include "WebProcess.h"
@@ -85,7 +85,7 @@
if (!webPage)
return;
- WebProcess::singleton().parentProcessConnection()->send(Messages::VisitedLinkProvider::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
+ WebProcess::singleton().parentProcessConnection()->send(Messages::VisitedLinkStore::AddVisitedLinkHashFromPage(webPage->pageID(), linkHash), m_identifier);
}
void VisitedLinkTableController::setVisitedLinkTable(const SharedMemory::Handle& handle)
