Title: [139364] trunk/Source/WebKit2
- Revision
- 139364
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-10 13:49:28 -0800 (Thu, 10 Jan 2013)
Log Message
[WK2] Set IndexedDB database path in WK2
https://bugs.webkit.org/show_bug.cgi?id=106257
Patch by Michael Pruett <mich...@68k.org> on 2013-01-10
Reviewed by Benjamin Poulain.
* WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::initialize):
* WebProcess/KeyValueStorage/WebKeyValueStorageManager.h:
(WebKeyValueStorageManager):
(WebKit::WebKeyValueStorageManager::indexedDBDatabaseDirectory):
* WebProcess/WebPage/WebPageGroupProxy.cpp:
(WebKit::WebPageGroupProxy::WebPageGroupProxy):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (139363 => 139364)
--- trunk/Source/WebKit2/ChangeLog 2013-01-10 21:47:52 UTC (rev 139363)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-10 21:49:28 UTC (rev 139364)
@@ -1,3 +1,18 @@
+2013-01-10 Michael Pruett <mich...@68k.org>
+
+ [WK2] Set IndexedDB database path in WK2
+ https://bugs.webkit.org/show_bug.cgi?id=106257
+
+ Reviewed by Benjamin Poulain.
+
+ * WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::initialize):
+ * WebProcess/KeyValueStorage/WebKeyValueStorageManager.h:
+ (WebKeyValueStorageManager):
+ (WebKit::WebKeyValueStorageManager::indexedDBDatabaseDirectory):
+ * WebProcess/WebPage/WebPageGroupProxy.cpp:
+ (WebKit::WebPageGroupProxy::WebPageGroupProxy):
+
2013-01-10 Tim Horton <timothy_hor...@apple.com>
Ensure that WebPageProxy's notion of pageScaleFactor is reset on didCommitLoad
Modified: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp (139363 => 139364)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-10 21:47:52 UTC (rev 139363)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.cpp 2013-01-10 21:49:28 UTC (rev 139364)
@@ -55,6 +55,9 @@
{
StorageTracker::initializeTracker(parameters.localStorageDirectory, this);
m_localStorageDirectory = parameters.localStorageDirectory;
+#if ENABLE(INDEXED_DATABASE)
+ m_indexedDBDatabaseDirectory = parameters.databaseDirectory;
+#endif
}
void WebKeyValueStorageManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h (139363 => 139364)
--- trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h 2013-01-10 21:47:52 UTC (rev 139363)
+++ trunk/Source/WebKit2/WebProcess/KeyValueStorage/WebKeyValueStorageManager.h 2013-01-10 21:49:28 UTC (rev 139364)
@@ -46,6 +46,9 @@
static const AtomicString& supplementName();
const String& localStorageDirectory() const { return m_localStorageDirectory; }
+#if ENABLE(INDEXED_DATABASE)
+ const String& indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
+#endif
private:
// WebProcessSupplement
@@ -67,6 +70,9 @@
Vector<uint64_t> m_originsRequestCallbackIDs;
String m_localStorageDirectory;
+#if ENABLE(INDEXED_DATABASE)
+ String m_indexedDBDatabaseDirectory;
+#endif
WebProcess* m_process;
};
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp (139363 => 139364)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2013-01-10 21:47:52 UTC (rev 139363)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2013-01-10 21:49:28 UTC (rev 139364)
@@ -31,6 +31,11 @@
#include <WebCore/DOMWrapperWorld.h>
#include <WebCore/PageGroup.h>
+#if ENABLE(INDEXED_DATABASE)
+#include "WebKeyValueStorageManager.h"
+#include <WebCore/GroupSettings.h>
+#endif
+
namespace WebKit {
PassRefPtr<WebPageGroupProxy> WebPageGroupProxy::create(const WebPageGroupData& data)
@@ -60,6 +65,11 @@
addUserStyleSheet(data.userStyleSheets[i]);
for (size_t i = 0; i < data.userScripts.size(); ++i)
addUserScript(data.userScripts[i]);
+
+#if ENABLE(INDEXED_DATABASE)
+ WebKeyValueStorageManager* keyValueStorageManager = WebProcess::shared().supplement<WebKeyValueStorageManager>();
+ m_pageGroup->groupSettings()->setIndexedDBDatabasePath(keyValueStorageManager->indexedDBDatabaseDirectory());
+#endif
}
void WebPageGroupProxy::addUserStyleSheet(const WebCore::UserStyleSheet& userStyleSheet)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
