Changeset 199256 in webkit

Timestamp:

Apr 8, 2016 5:33:12 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Build fix with IndexedDB disabled but DatabaseProcess enabled after r199230
​https://bugs.webkit.org/show_bug.cgi?id=156321

Rubber-stamped by Brady Eidson.

• DatabaseProcess/DatabaseProcess.cpp:

(WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
(WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
(WebKit::DatabaseProcess::accessToTemporaryFileComplete):
(WebKit::DatabaseProcess::indexedDatabaseOrigins):

• DatabaseProcess/DatabaseProcess.h:

Add some more guards.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• DatabaseProcess/DatabaseProcess.cpp (modified) (2 diffs)
• DatabaseProcess/DatabaseProcess.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-08  Alex Christensen  <achristensen@webkit.org>
+
+        Build fix with IndexedDB disabled but DatabaseProcess enabled after r199230
+        https://bugs.webkit.org/show_bug.cgi?id=156321
+
+        Rubber-stamped by Brady Eidson.
+
+        * DatabaseProcess/DatabaseProcess.cpp:
+        (WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
+        (WebKit::DatabaseProcess::grantSandboxExtensionsForBlobs):
+        (WebKit::DatabaseProcess::accessToTemporaryFileComplete):
+        (WebKit::DatabaseProcess::indexedDatabaseOrigins):
+        * DatabaseProcess/DatabaseProcess.h:
+        Add some more guards.
+
 2016-04-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp

@@ -306 +306 @@
 }
 
+#if ENABLE(INDEXED_DATABASE)
 void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
 {
@@ -333 +334 @@
 }
 
-#if ENABLE(INDEXED_DATABASE)
 Vector<RefPtr<WebCore::SecurityOrigin>> DatabaseProcess::indexedDatabaseOrigins()
 {

trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

@@ -48 +48 @@
 struct DatabaseProcessCreationParameters;
 
-class DatabaseProcess : public ChildProcess, public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler {
+class DatabaseProcess : public ChildProcess
+#if ENABLE(INDEXED_DATABASE)
+    , public WebCore::IDBServer::IDBBackingStoreTemporaryFileHandler
+#endif
+{
     WTF_MAKE_NONCOPYABLE(DatabaseProcess);
     friend class NeverDestroyed<DatabaseProcess>;
@@ -68 +72 @@
     void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>);
 
+#if ENABLE(INDEXED_DATABASE)
     // WebCore::IDBServer::IDBBackingStoreFileHandler
     void prepareForAccessToTemporaryFile(const String& path) final;
     void accessToTemporaryFileComplete(const String& path) final;
+#endif
 
 private:
@@ -97 +103 @@
     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>>&);