[webkit-changes] [199256] trunk/Source/WebKit2

[achristensen]

Title: [199256] trunk/Source/WebKit2

Revision

199256

Author

achristen...@apple.com

Date

2016-04-08 17:33:12 -0700 (Fri, 08 Apr 2016)

Log 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.

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp
• trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h

Diff

Modified: trunk/Source/WebKit2/ChangeLog (199255 => 199256)

--- trunk/Source/WebKit2/ChangeLog	2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/ChangeLog	2016-04-09 00:33:12 UTC (rev 199256)
@@ -1,3 +1,18 @@
+2016-04-08  Alex Christensen  <achristen...@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.fra...@apple.com>
 
         [iOS WK2] Stop using exposedContentRect for history scroll state restoration

Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (199255 => 199256)

--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp	2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp	2016-04-09 00:33:12 UTC (rev 199256)
@@ -305,6 +305,7 @@
 #endif
 }
 
+#if ENABLE(INDEXED_DATABASE)
 void DatabaseProcess::grantSandboxExtensionsForBlobs(const Vector<String>& paths, const SandboxExtension::HandleArray& handles)
 {
     ASSERT(paths.size() == handles.size());
@@ -332,7 +333,6 @@
         extension->revoke();
 }
 
-#if ENABLE(INDEXED_DATABASE)
 Vector<RefPtr<WebCore::SecurityOrigin>> DatabaseProcess::indexedDatabaseOrigins()
 {
     if (m_indexedDatabaseDirectory.isEmpty())

Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (199255 => 199256)

--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h	2016-04-08 23:01:01 UTC (rev 199255)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h	2016-04-09 00:33:12 UTC (rev 199256)
@@ -47,7 +47,11 @@
 enum class WebsiteDataType;
 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>;
 public:
@@ -67,9 +71,11 @@
 
     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:
     DatabaseProcess();
@@ -96,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);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes