Diff
Modified: trunk/Source/WebCore/ChangeLog (180264 => 180265)
--- trunk/Source/WebCore/ChangeLog 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/ChangeLog 2015-02-18 16:31:15 UTC (rev 180265)
@@ -1,3 +1,15 @@
+2015-02-17 Anders Carlsson <[email protected]>
+
+ Add API for clearing in-memory caches to WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=141724
+
+ Reviewed by Tim Horton.
+
+ Add a version of evictResources that takes a session id.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::evictResources):
+
2015-02-18 Timothy Horton <[email protected]>
Remove more references to WebCore.exp.in
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (180264 => 180265)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-02-18 16:31:15 UTC (rev 180265)
@@ -680,6 +680,22 @@
setDisabled(false);
}
+void MemoryCache::evictResources(SessionID sessionID)
+{
+ if (disabled())
+ return;
+
+ auto it = m_sessionResources.find(sessionID);
+ if (it == m_sessionResources.end())
+ return;
+ auto& resources = *it->value;
+
+ for (int i = 0, size = resources.size(); i < size; ++i)
+ remove(*resources.begin()->value);
+
+ ASSERT(!m_sessionResources.contains(sessionID));
+}
+
void MemoryCache::prune()
{
if (m_liveSize + m_deadSize <= m_capacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (180264 => 180265)
--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-02-18 16:31:15 UTC (rev 180265)
@@ -115,6 +115,7 @@
bool disabled() const { return m_disabled; }
WEBCORE_EXPORT void evictResources();
+ WEBCORE_EXPORT void evictResources(SessionID);
void prune();
unsigned size() const { return m_liveSize + m_deadSize; }
Modified: trunk/Source/WebKit2/ChangeLog (180264 => 180265)
--- trunk/Source/WebKit2/ChangeLog 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-18 16:31:15 UTC (rev 180265)
@@ -1,3 +1,65 @@
+2015-02-17 Anders Carlsson <[email protected]>
+
+ Add API for clearing in-memory caches to WKWebsiteDataStore
+ https://bugs.webkit.org/show_bug.cgi?id=141724
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ Add WebsiteDataTypeMemoryCache.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ Add WKWebsiteDataTypeMemoryCache.
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (toWebsiteDataTypes):
+ Handle WKWebsiteDataTypeMemoryCache and convert it to WebsiteDataTypeMemoryCache.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::generateCallbackID):
+ Generate a new callback.
+
+ (WebKit::WebProcessProxy::~WebProcessProxy):
+ Assert that we don't have any pending callbacks.
+
+ (WebKit::WebProcessProxy::connectionDidClose):
+ Invoke pending callbacks.
+
+ (WebKit::WebProcessProxy::canTerminateChildProcess):
+ Don't try to terminate if we have pending callbacks.
+
+ (WebKit::WebProcessProxy::didDeleteWebsiteData):
+ Take the callback and invoke it.
+
+ (WebKit::WebProcessProxy::deleteWebsiteData):
+ Send a delete message.
+
+ * UIProcess/WebProcessProxy.h:
+ Add new members.
+
+ * UIProcess/WebProcessProxy.messages.in:
+ Add DidDeleteWebsiteData message.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::computeNetworkProcessAccessType):
+ Spell persistent correctly.
+
+ (WebKit::computeWebProcessAccessType):
+ Return a web process access type given the a data type mask.
+
+ (WebKit::WebsiteDataStore::removeData):
+ Ask any associated web processes to remove website data.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::deleteWebsiteData):
+ Delete the memory cache if requested.
+
+ * WebProcess/WebProcess.h:
+ Add new member.
+
+ * WebProcess/WebProcess.messages.in:
+ Add DeleteWebsiteData message.
+
2015-02-17 Timothy Horton <[email protected]>
REGRESSION (r178595): Clicking on DD highlights sometimes do not work
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (180264 => 180265)
--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-02-18 16:31:15 UTC (rev 180265)
@@ -31,7 +31,8 @@
enum WebsiteDataTypes {
WebsiteDataTypeCookies = 1 << 0,
WebsiteDataTypeDiskCache = 1 << 1,
- WebsiteDataTypeLocalStorage = 1 << 2,
+ WebsiteDataTypeMemoryCache = 1 << 2,
+ WebsiteDataTypeLocalStorage = 1 << 3,
};
};
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-02-18 16:31:15 UTC (rev 180265)
@@ -32,8 +32,9 @@
typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
WKWebsiteDataTypeCookies = 1 << 0,
WKWebsiteDataTypeDiskCache = 1 << 1,
+ WKWebsiteDataTypeMemoryCache = 1 << 2,
- WKWebsiteDataTypeLocalStorage = 1 << 2,
+ WKWebsiteDataTypeLocalStorage = 1 << 3,
WKWebsiteDataTypeAll = NSUIntegerMax,
} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-02-18 16:31:15 UTC (rev 180265)
@@ -62,6 +62,8 @@
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeCookies;
if (wkWebsiteDataTypes & WKWebsiteDataTypeDiskCache)
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
+ if (wkWebsiteDataTypes & WKWebsiteDataTypeMemoryCache)
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-02-18 16:31:15 UTC (rev 180265)
@@ -79,6 +79,13 @@
return ++uniquePageID;
}
+static uint64_t generateCallbackID()
+{
+ static uint64_t callbackID;
+
+ return ++callbackID;
+}
+
static WebProcessProxy::WebPageProxyMap& globalPageMap()
{
ASSERT(RunLoop::isMain());
@@ -106,6 +113,8 @@
WebProcessProxy::~WebProcessProxy()
{
+ ASSERT(m_pendingDeleteWebsiteDataCallbacks.isEmpty());
+
if (m_webConnection)
m_webConnection->invalidate();
@@ -137,6 +146,10 @@
{
ASSERT(this->connection() == &connection);
+ for (const auto& callback : m_pendingDeleteWebsiteDataCallbacks.values())
+ callback();
+ m_pendingDeleteWebsiteDataCallbacks.clear();
+
for (auto& page : m_pageMap.values())
page->connectionDidClose(connection);
}
@@ -566,6 +579,9 @@
if (m_downloadProxyMap && !m_downloadProxyMap->isEmpty())
return false;
+ if (!m_pendingDeleteWebsiteDataCallbacks.isEmpty())
+ return false;
+
if (!m_processPool->shouldTerminate(this))
return false;
@@ -581,6 +597,12 @@
}
}
+void WebProcessProxy::didDeleteWebsiteData(uint64_t callbackID)
+{
+ auto callback = m_pendingDeleteWebsiteDataCallbacks.take(callbackID);
+ callback();
+}
+
void WebProcessProxy::updateTextCheckerState()
{
if (canSendMessage())
@@ -616,6 +638,16 @@
page->viewStateDidChange(ViewState::IsVisuallyIdle);
}
+void WebProcessProxy::deleteWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
+{
+ ASSERT(canSendMessage());
+
+ uint64_t callbackID = generateCallbackID();
+
+ m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTF::move(completionHandler));
+ send(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
+}
+
void WebProcessProxy::requestTermination()
{
if (state() != State::Running)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-02-18 16:31:15 UTC (rev 180265)
@@ -37,6 +37,7 @@
#include "WebConnectionToWebProcess.h"
#include "WebPageProxy.h"
#include "WebProcessProxyMessages.h"
+#include "WebsiteDataTypes.h"
#include <WebCore/LinkHash.h>
#include <memory>
#include <wtf/Forward.h>
@@ -121,6 +122,8 @@
void didSaveToPageCache();
void releasePageCache();
+ void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+
void enableSuddenTermination();
void disableSuddenTermination();
@@ -145,7 +148,7 @@
void setIsHoldingLockedFiles(bool);
ProcessThrottler& throttler() { return *m_throttler; }
-
+
private:
explicit WebProcessProxy(WebProcessPool&);
@@ -165,6 +168,8 @@
void shouldTerminate(bool& shouldTerminate);
+ void didDeleteWebsiteData(uint64_t callbackID);
+
// Plugins
#if ENABLE(NETSCAPE_PLUGIN_API)
void getPlugins(bool refresh, Vector<WebCore::PluginInfo>& plugins, Vector<WebCore::PluginInfo>& applicationPlugins);
@@ -220,6 +225,8 @@
std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
CustomProtocolManagerProxy m_customProtocolManagerProxy;
+ HashMap<uint64_t, std::function<void ()>> m_pendingDeleteWebsiteDataCallbacks;
+
int m_numberOfTimesSuddenTerminationWasDisabled;
std::unique_ptr<ProcessThrottler> m_throttler;
ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-02-18 16:31:15 UTC (rev 180265)
@@ -29,6 +29,8 @@
EnableSuddenTermination()
DisableSuddenTermination()
+ DidDeleteWebsiteData(uint64_t callbackID)
+
# Plugin messages.
#if ENABLE(NETSCAPE_PLUGIN_API)
GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins, Vector<WebCore::PluginInfo> applicationPlugins)
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (180264 => 180265)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-02-18 16:31:15 UTC (rev 180265)
@@ -95,23 +95,33 @@
Launch,
};
-static ProcessAccessType computeNetworkProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistantStore)
+static ProcessAccessType computeNetworkProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
{
ProcessAccessType processAccessType = ProcessAccessType::None;
if (dataTypes & WebsiteDataTypeCookies) {
- if (isNonPersistantStore)
+ if (isNonPersistentStore)
processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
else
processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
}
- if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistantStore)
+ if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
return processAccessType;
}
+static ProcessAccessType computeWebProcessAccessType(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
+{
+ ProcessAccessType processAccessType = ProcessAccessType::None;
+
+ if (dataTypes & WebsiteDataTypeMemoryCache)
+ processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
+
+ return processAccessType;
+}
+
void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
{
struct CallbackAggregator : public RefCounted<CallbackAggregator> {
@@ -173,6 +183,31 @@
}
}
+ auto webProcessAccessType = computeWebProcessAccessType(dataTypes, isNonPersistent());
+ if (webProcessAccessType != ProcessAccessType::None) {
+ for (auto& process : processes()) {
+ switch (webProcessAccessType) {
+ case ProcessAccessType::OnlyIfLaunched:
+ if (!process->canSendMessage())
+ continue;
+ break;
+
+ case ProcessAccessType::Launch:
+ // FIXME: Handle this.
+ ASSERT_NOT_REACHED();
+ break;
+
+ case ProcessAccessType::None:
+ ASSERT_NOT_REACHED();
+ }
+
+ callbackAggregator->addPendingCallback();
+ process->deleteWebsiteData(m_sessionID, dataTypes, modifiedSince, [callbackAggregator] {
+ callbackAggregator->removePendingCallback();
+ });
+ }
+ }
+
if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
callbackAggregator->addPendingCallback();
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (180264 => 180265)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-18 16:31:15 UTC (rev 180265)
@@ -61,6 +61,7 @@
#include "WebProcessPoolMessages.h"
#include "WebProcessProxyMessages.h"
#include "WebResourceCacheManager.h"
+#include "WebsiteDataTypes.h"
#include <_javascript_Core/JSLock.h>
#include <_javascript_Core/MemoryStatistics.h>
#include <WebCore/AXObjectCache.h>
@@ -1131,6 +1132,18 @@
PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
}
+void WebProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+{
+ if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
+ PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
+ MemoryCache::singleton().evictResources(sessionID);
+
+ CrossOriginPreflightResultCache::singleton().empty();
+ }
+
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
+}
+
#if !PLATFORM(COCOA)
void WebProcess::initializeProcessName(const ChildProcessInitializationParameters&)
{
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (180264 => 180265)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-18 16:31:15 UTC (rev 180265)
@@ -259,6 +259,8 @@
void releasePageCache();
+ void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+
#if USE(SOUP)
void setIgnoreTLSErrors(bool);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (180264 => 180265)
--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-18 13:31:15 UTC (rev 180264)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-18 16:31:15 UTC (rev 180265)
@@ -79,6 +79,8 @@
ReleasePageCache()
+ DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+
SetProcessSuppressionEnabled(bool flag)
#if PLATFORM(COCOA)
SetQOS(int latencyQOS, int throughputQOS)
