HTTPCookieStore::HTTPCookieStore(WebKit::WebsiteDataStore& websiteDataStore)
: m_owningDataStore(websiteDataStore)
{
- if (!m_owningDataStore->processPoolForCookieStorageOperations())
+ if (!m_owningDataStore.processPoolForCookieStorageOperations())
registerForNewProcessPoolNotifications();
}
void HTTPCookieStore::cookies(CompletionHandler<void(const Vector<WebCore::Cookie>&)>&& completionHandler)
{
- auto* pool = m_owningDataStore->processPoolForCookieStorageOperations();
+ auto* pool = m_owningDataStore.processPoolForCookieStorageOperations();
if (!pool) {
Vector<WebCore::Cookie> allCookies;
- if (m_owningDataStore->sessionID() == PAL::SessionID::defaultSessionID())
+ if (m_owningDataStore.sessionID() == PAL::SessionID::defaultSessionID())
allCookies = getAllDefaultUIProcessCookieStoreCookies();
- allCookies.appendVector(m_owningDataStore->pendingCookies());
+ allCookies.appendVector(m_owningDataStore.pendingCookies());
callOnMainThread([completionHandler = WTFMove(completionHandler), allCookies] () mutable {
completionHandler(allCookies);
}
auto* cookieManager = pool->supplement<WebKit::WebCookieManagerProxy>();
- cookieManager->getAllCookies(m_owningDataStore->sessionID(), [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)] (const Vector<WebCore::Cookie>& cookies, CallbackBase::Error error) mutable {
+ cookieManager->getAllCookies(m_owningDataStore.sessionID(), [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)] (const Vector<WebCore::Cookie>& cookies, CallbackBase::Error error) mutable {
completionHandler(cookies);
});
}
void HTTPCookieStore::setCookie(const WebCore::Cookie& cookie, CompletionHandler<void()>&& completionHandler)
{
- auto* pool = m_owningDataStore->processPoolForCookieStorageOperations();
+ auto* pool = m_owningDataStore.processPoolForCookieStorageOperations();
if (!pool) {
// FIXME: pendingCookies used for defaultSession because session cookies cannot be propagated to Network Process with uiProcessCookieStorageIdentifier.
- if (m_owningDataStore->sessionID() == PAL::SessionID::defaultSessionID() && !cookie.session)
+ if (m_owningDataStore.sessionID() == PAL::SessionID::defaultSessionID() && !cookie.session)
setCookieInDefaultUIProcessCookieStore(cookie);
else
- m_owningDataStore->addPendingCookie(cookie);
+ m_owningDataStore.addPendingCookie(cookie);
callOnMainThread([completionHandler = WTFMove(completionHandler)] () mutable {
completionHandler();
}
auto* cookieManager = pool->supplement<WebKit::WebCookieManagerProxy>();
- cookieManager->setCookie(m_owningDataStore->sessionID(), cookie, [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)] (CallbackBase::Error error) mutable {
+ cookieManager->setCookie(m_owningDataStore.sessionID(), cookie, [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)] (CallbackBase::Error error) mutable {
completionHandler();
});
}
void HTTPCookieStore::deleteCookie(const WebCore::Cookie& cookie, CompletionHandler<void()>&& completionHandler)
{
- auto* pool = m_owningDataStore->processPoolForCookieStorageOperations();
+ auto* pool = m_owningDataStore.processPoolForCookieStorageOperations();
if (!pool) {
- if (m_owningDataStore->sessionID() == PAL::SessionID::defaultSessionID() && !cookie.session)
+ if (m_owningDataStore.sessionID() == PAL::SessionID::defaultSessionID() && !cookie.session)
deleteCookieFromDefaultUIProcessCookieStore(cookie);
else
- m_owningDataStore->removePendingCookie(cookie);
+ m_owningDataStore.removePendingCookie(cookie);
callOnMainThread([completionHandler = WTFMove(completionHandler)] () mutable {
completionHandler();
}
auto* cookieManager = pool->supplement<WebKit::WebCookieManagerProxy>();
- cookieManager->deleteCookie(m_owningDataStore->sessionID(), cookie, [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)](CallbackBase::Error error) mutable {
+ cookieManager->deleteCookie(m_owningDataStore.sessionID(), cookie, [pool = WTFMove(pool), completionHandler = WTFMove(completionHandler)](CallbackBase::Error error) mutable {
completionHandler();
});
}
m_cookieManagerProxyObserver = std::make_unique<APIWebCookieManagerProxyObserver>(*this);
- auto* pool = m_owningDataStore->processPoolForCookieStorageOperations();
+ auto* pool = m_owningDataStore.processPoolForCookieStorageOperations();
if (!pool) {
ASSERT(!m_observingUIProcessCookies);
}
m_observedCookieManagerProxy = pool->supplement<WebKit::WebCookieManagerProxy>();
- m_observedCookieManagerProxy->registerObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
+ m_observedCookieManagerProxy->registerObserver(m_owningDataStore.sessionID(), *m_cookieManagerProxyObserver);
}
void HTTPCookieStore::unregisterObserver(Observer& observer)
return;
if (m_observedCookieManagerProxy)
- m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
+ m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore.sessionID(), *m_cookieManagerProxyObserver);
if (m_observingUIProcessCookies)
stopObservingChangesToDefaultUIProcessCookieStore();
void HTTPCookieStore::cookieManagerDestroyed()
{
- m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
+ m_observedCookieManagerProxy->unregisterObserver(m_owningDataStore.sessionID(), *m_cookieManagerProxyObserver);
m_observedCookieManagerProxy = nullptr;
- auto* pool = m_owningDataStore->processPoolForCookieStorageOperations();
+ auto* pool = m_owningDataStore.processPoolForCookieStorageOperations();
if (!pool)
return;
m_observedCookieManagerProxy = pool->supplement<WebKit::WebCookieManagerProxy>();
- m_observedCookieManagerProxy->registerObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
+ m_observedCookieManagerProxy->registerObserver(m_owningDataStore.sessionID(), *m_cookieManagerProxyObserver);
}
void HTTPCookieStore::registerForNewProcessPoolNotifications()
ASSERT(!m_processPoolCreationListenerIdentifier);
m_processPoolCreationListenerIdentifier = WebProcessPool::registerProcessPoolCreationListener([this](WebProcessPool& newProcessPool) {
- if (!m_owningDataStore->isAssociatedProcessPool(newProcessPool))
+ if (!m_owningDataStore.isAssociatedProcessPool(newProcessPool))
return;
// Now that an associated process pool exists, we need to flush the UI process cookie store
if (m_cookieManagerProxyObserver) {
m_observedCookieManagerProxy = newProcessPool.supplement<WebKit::WebCookieManagerProxy>();
- m_observedCookieManagerProxy->registerObserver(m_owningDataStore->sessionID(), *m_cookieManagerProxyObserver);
+ m_observedCookieManagerProxy->registerObserver(m_owningDataStore.sessionID(), *m_cookieManagerProxyObserver);
}
unregisterForNewProcessPoolNotifications();
});
m_processPoolCreationListenerIdentifier = 0;
}
+void HTTPCookieStore::ref() const
+{
+ m_owningDataStore.ref();
+}
+
+void HTTPCookieStore::deref() const
+{
+ m_owningDataStore.deref();
+}
+
#if !PLATFORM(COCOA)
void HTTPCookieStore::flushDefaultUIProcessCookieStore() { }
Vector<WebCore::Cookie> HTTPCookieStore::getAllDefaultUIProcessCookieStoreCookies() { return { }; }