Modified: trunk/Source/WebKit2/ChangeLog (171752 => 171753)
--- trunk/Source/WebKit2/ChangeLog 2014-07-29 19:34:56 UTC (rev 171752)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-29 20:08:58 UTC (rev 171753)
@@ -1,3 +1,13 @@
+2014-07-29 Csaba Osztrogonác <[email protected]>
+
+ URTBF for !ENABLE(DATABASE_PROCESS) platforms.
+
+ * WebProcess/OriginData/WebOriginDataManager.cpp:
+ (WebKit::WebOriginDataManager::getOrigins):
+ (WebKit::WebOriginDataManager::deleteEntriesForOrigin):
+ (WebKit::WebOriginDataManager::deleteEntriesModifiedBetweenDates):
+ (WebKit::WebOriginDataManager::deleteAllEntries):
+
2014-07-29 Brady Eidson <[email protected]>
Make WKOriginDataManager actually operate on IndexedDatabases.
Modified: trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp (171752 => 171753)
--- trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp 2014-07-29 19:34:56 UTC (rev 171752)
+++ trunk/Source/WebKit2/WebProcess/OriginData/WebOriginDataManager.cpp 2014-07-29 20:08:58 UTC (rev 171753)
@@ -26,7 +26,10 @@
#include "config.h"
#include "WebOriginDataManager.h"
+#include "ChildProcess.h"
+#if ENABLE(DATABASE_PROCESS)
#include "DatabaseProcess.h"
+#endif
#include "SecurityOriginData.h"
#include "WebCoreArgumentCoders.h"
#include "WebOriginDataManagerMessages.h"
@@ -53,6 +56,7 @@
void WebOriginDataManager::getOrigins(WKOriginDataTypes types, uint64_t callbackID)
{
+#if ENABLE(DATABASE_PROCESS)
// FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
// If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
// for multiple types into the one callback.
@@ -60,6 +64,7 @@
DatabaseProcess::shared().getIndexedDatabaseOrigins(callbackID);
return;
}
+#endif
Vector<SecurityOriginData> results;
m_childProcess->send(Messages::WebOriginDataManagerProxy::DidGetOrigins(results, callbackID), 0);
@@ -67,6 +72,7 @@
void WebOriginDataManager::deleteEntriesForOrigin(WKOriginDataTypes types, const SecurityOriginData& originData, uint64_t callbackID)
{
+#if ENABLE(DATABASE_PROCESS)
// FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
// If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
// for multiple types into the one callback.
@@ -74,12 +80,14 @@
DatabaseProcess::shared().deleteIndexedDatabaseEntriesForOrigin(originData, callbackID);
return;
}
+#endif
m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
}
void WebOriginDataManager::deleteEntriesModifiedBetweenDates(WKOriginDataTypes types, double startTime, double endTime, uint64_t callbackID)
{
+#if ENABLE(DATABASE_PROCESS)
// FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
// If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
// for multiple types into the one callback.
@@ -87,11 +95,13 @@
DatabaseProcess::shared().deleteIndexedDatabaseEntriesModifiedBetweenDates(startTime, endTime, callbackID);
return;
}
+#endif
m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteEntries(callbackID), 0);
}
void WebOriginDataManager::deleteAllEntries(WKOriginDataTypes types, uint64_t callbackID)
{
+#if ENABLE(DATABASE_PROCESS)
// FIXME: For now, the DatabaseProcess only handles IndexedDatabase origin data.
// If it ever starts handling other data types (e.g. WebSQL) then it will have to aggregrate requests
// for multiple types into the one callback.
@@ -99,6 +109,7 @@
DatabaseProcess::shared().deleteAllIndexedDatabaseEntries(callbackID);
return;
}
+#endif
m_childProcess->send(Messages::WebOriginDataManagerProxy::DidDeleteAllEntries(callbackID), 0);
}
