Modified: trunk/Source/WebKit2/ChangeLog (201642 => 201643)
--- trunk/Source/WebKit2/ChangeLog 2016-06-03 15:40:40 UTC (rev 201642)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-03 16:13:25 UTC (rev 201643)
@@ -1,3 +1,15 @@
+2016-06-03 Csaba Osztrogonác <[email protected]>
+
+ Fix the !ENABLE(INDEXED_DATABASE) build after r201575
+ https://bugs.webkit.org/show_bug.cgi?id=158346
+
+ Reviewed by Brady Eidson.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::fetchWebsiteData):
+ (WebKit::DatabaseProcess::deleteWebsiteData):
+ (WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
+
2016-06-02 Chris Dumez <[email protected]>
Crash under WebProcess::registerWithStateDumper()
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (201642 => 201643)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-06-03 15:40:40 UTC (rev 201642)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-06-03 16:13:25 UTC (rev 201643)
@@ -194,11 +194,11 @@
void DatabaseProcess::fetchWebsiteData(SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
{
+#if ENABLE(INDEXED_DATABASE)
auto completionHandler = [this, callbackID](const WebsiteData& websiteData) {
parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
};
-#if ENABLE(INDEXED_DATABASE)
if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
// FIXME: Pick the right database store based on the session ID.
postDatabaseTask(CrossThreadTask([this, websiteDataTypes, completionHandler = WTFMove(completionHandler)]() mutable {
@@ -216,11 +216,11 @@
void DatabaseProcess::deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
{
+#if ENABLE(INDEXED_DATABASE)
auto completionHandler = [this, callbackID]() {
parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteData(callbackID), 0);
};
-#if ENABLE(INDEXED_DATABASE)
if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases))
idbServer().closeAndDeleteDatabasesModifiedSince(modifiedSince, WTFMove(completionHandler));
#endif
@@ -228,11 +228,11 @@
void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
{
+#if ENABLE(INDEXED_DATABASE)
auto completionHandler = [this, callbackID]() {
parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
};
-#if ENABLE(INDEXED_DATABASE)
if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases))
idbServer().closeAndDeleteDatabasesForOrigins(securityOriginDatas, WTFMove(completionHandler));
#endif
