Title: [138471] trunk/Source/WebKit2
- Revision
- 138471
- Author
- [email protected]
- Date
- 2012-12-25 18:36:35 -0800 (Tue, 25 Dec 2012)
Log Message
Fix the Database manager assert, again.
* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
(WebKit):
(WebKit::WebDatabaseManager::WebDatabaseManager):
(WebKit::WebDatabaseManager::initialize):
* WebProcess/WebCoreSupport/WebDatabaseManager.h:
(WebDatabaseManager):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138470 => 138471)
--- trunk/Source/WebKit2/ChangeLog 2012-12-26 02:29:59 UTC (rev 138470)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-26 02:36:35 UTC (rev 138471)
@@ -1,3 +1,16 @@
+2012-12-25 Sam Weinig <[email protected]>
+
+ Fix the Database manager assert, again.
+
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit):
+ (WebKit::WebDatabaseManager::WebDatabaseManager):
+ (WebKit::WebDatabaseManager::initialize):
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ (WebDatabaseManager):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2012-12-25 Huang Dongsung <[email protected]>
Coordinated Graphics: Manage the lifecycle of CoordinatedGraphicsLayer explicitly.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (138470 => 138471)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2012-12-26 02:29:59 UTC (rev 138470)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2012-12-26 02:36:35 UTC (rev 138471)
@@ -41,16 +41,16 @@
namespace WebKit {
-void WebDatabaseManager::initialize(const String& databaseDirectory)
-{
- DatabaseManager::manager().initialize(databaseDirectory);
-}
-
WebDatabaseManager::WebDatabaseManager(WebProcess* process)
: m_process(process)
{
m_process->addMessageReceiver(Messages::WebDatabaseManager::messageReceiverName(), this);
+}
+
+void WebDatabaseManager::initialize(const String& databaseDirectory)
+{
+ DatabaseManager::manager().initialize(databaseDirectory);
DatabaseManager::manager().setClient(this);
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h (138470 => 138471)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2012-12-26 02:29:59 UTC (rev 138470)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2012-12-26 02:36:35 UTC (rev 138471)
@@ -41,7 +41,7 @@
WTF_MAKE_NONCOPYABLE(WebDatabaseManager);
public:
WebDatabaseManager(WebProcess*);
- static void initialize(const String& databaseDirectory);
+ void initialize(const String& databaseDirectory);
void setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const;
void deleteAllDatabases() const;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (138470 => 138471)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-26 02:29:59 UTC (rev 138470)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-26 02:36:35 UTC (rev 138471)
@@ -253,8 +253,7 @@
#if ENABLE(SQL_DATABASE)
// Make sure the WebDatabaseManager is initialized so that the Database directory is set.
- WebDatabaseManager::initialize(parameters.databaseDirectory);
- m_databaseManager = new WebDatabaseManager(this);
+ m_databaseManager->initialize(parameters.databaseDirectory);
#endif
#if ENABLE(ICONDATABASE)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
