Changeset 194124 in webkit

Timestamp:

Dec 15, 2015 4:52:55 PM (8 years ago)

Author:

andersca@apple.com

Message:

Call DatabaseManager directly from WKBundle.cpp
​https://bugs.webkit.org/show_bug.cgi?id=152317

Reviewed by Tim Horton.

This is in preparation for getting rid of some old database manager code.

• WebProcess/InjectedBundle/API/c/WKBundle.cpp:

(WKBundleClearAllDatabases):
(WKBundleSetDatabaseQuota):

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::clearAllDatabases): Deleted.
(WebKit::InjectedBundle::setDatabaseQuota): Deleted.

• WebProcess/InjectedBundle/InjectedBundle.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (2 diffs)
• WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundle.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-15  Anders Carlsson  <andersca@apple.com>
+
+        Call DatabaseManager directly from WKBundle.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=152317
+
+        Reviewed by Tim Horton.
+
+        This is in preparation for getting rid of some old database manager code.
+
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleClearAllDatabases):
+        (WKBundleSetDatabaseQuota):
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::clearAllDatabases): Deleted.
+        (WebKit::InjectedBundle::setDatabaseQuota): Deleted.
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+
 2015-12-15  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -38 +38 @@
 #include "WebPage.h"
 #include "WebPageGroupProxy.h"
-
+#include <WebCore/DatabaseManager.h>
+
+using namespace WebCore;
 using namespace WebKit;
 
@@ -199 +201 @@
 }
 
-void WKBundleClearAllDatabases(WKBundleRef bundleRef)
-{
-    toImpl(bundleRef)->clearAllDatabases();
+void WKBundleClearAllDatabases(WKBundleRef)
+{
+    DatabaseManager::singleton().deleteAllDatabases();
 }
 
 void WKBundleSetDatabaseQuota(WKBundleRef bundleRef, uint64_t quota)
 {
-    toImpl(bundleRef)->setDatabaseQuota(quota);
+    // Historically, we've used the following (somewhat non-sensical) string
+    // for the databaseIdentifier of local files.
+    DatabaseManager::singleton().setQuota(SecurityOrigin::createFromDatabaseIdentifier("file__0").ptr(), quota);
 }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -343 +343 @@
 }
 
-void InjectedBundle::clearAllDatabases()
-{
-    WebProcess::singleton().supplement<WebDatabaseManager>()->deleteAllDatabases();
-}
-
-void InjectedBundle::setDatabaseQuota(uint64_t quota)
-{
-    // Historically, we've used the following (somewhat non-sensical) string
-    // for the databaseIdentifier of local files.
-    WebProcess::singleton().supplement<WebDatabaseManager>()->setQuotaForOrigin("file__0", quota);
-}
-
 int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -134 +134 @@
     void removeAllUserContent(WebPageGroupProxy*);
 
-    // Local storage API
-    void clearAllDatabases();
-    void setDatabaseQuota(uint64_t);
-
     // Garbage collection API
     void garbageCollectJavaScriptObjects();