Title: [199532] trunk/Source/WebKit2
- Revision
- 199532
- Author
- [email protected]
- Date
- 2016-04-14 00:49:55 -0700 (Thu, 14 Apr 2016)
Log Message
Fix build without IndexedDB.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
(WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
(WebKit::DatabaseProcess::prepareForAccessToTemporaryFile):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseProcess.messages.in:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199531 => 199532)
--- trunk/Source/WebKit2/ChangeLog 2016-04-14 06:37:42 UTC (rev 199531)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-14 07:49:55 UTC (rev 199532)
@@ -1,3 +1,14 @@
+2016-04-14 Alex Christensen <[email protected]>
+
+ Fix build without IndexedDB.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
+ (WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
+ (WebKit::DatabaseProcess::prepareForAccessToTemporaryFile):
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/DatabaseProcess.messages.in:
+
2016-04-13 Daniel Bates <[email protected]>
REGRESSION (r199401): Internal builds of Safari hang on launch
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (199531 => 199532)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-04-14 06:37:42 UTC (rev 199531)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-04-14 07:49:55 UTC (rev 199532)
@@ -305,7 +305,6 @@
#endif
}
-#if ENABLE(INDEXED_DATABASE)
void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
{
ASSERT(paths.size() == handles.size());
@@ -316,6 +315,7 @@
}
}
+#if ENABLE(INDEXED_DATABASE)
void DatabaseProcess::prepareForAccessToTemporaryFile(const String& path)
{
if (auto extension = m_blobTemporaryFileSandboxExtensions.get(path))
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (199531 => 199532)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-04-14 06:37:42 UTC (rev 199531)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-04-14 07:49:55 UTC (rev 199532)
@@ -102,9 +102,9 @@
void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
+ void grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray&);
#if ENABLE(INDEXED_DATABASE)
- void grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray&);
Vector<RefPtr<WebCore::SecurityOrigin>> indexedDatabaseOrigins();
void deleteIndexedDatabaseEntriesForOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>&);
void deleteIndexedDatabaseEntriesModifiedSince(std::chrono::system_clock::time_point modifiedSince);
@@ -120,11 +120,9 @@
#if ENABLE(INDEXED_DATABASE)
String m_indexedDatabaseDirectory;
-
RefPtr<WebCore::IDBServer::IDBServer> m_idbServer;
-
- HashMap<String, RefPtr<SandboxExtension>> m_blobTemporaryFileSandboxExtensions;
#endif
+ HashMap<String, RefPtr<SandboxExtension>> m_blobTemporaryFileSandboxExtensions;
Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_databaseTasks;
Lock m_databaseTaskMutex;
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (199531 => 199532)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2016-04-14 06:37:42 UTC (rev 199531)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2016-04-14 07:49:55 UTC (rev 199532)
@@ -32,9 +32,7 @@
FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
-#if ENABLE(INDEXED_DATABASE)
GrantSandboxExtensionsForBlobs(Vector<String> paths, WebKit::SandboxExtension::HandleArray extensions)
-#endif
}
#endif // ENABLE(DATABASE_PROCESS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
