Title: [138444] trunk/Source/WebKit2
- Revision
- 138444
- Author
- [email protected]
- Date
- 2012-12-24 10:12:09 -0800 (Mon, 24 Dec 2012)
Log Message
Fix WebKit2 asserting on launch.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
* WebProcess/WebProcess.h:
(WebKit::WebProcess::databaseManager):
(WebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138443 => 138444)
--- trunk/Source/WebKit2/ChangeLog 2012-12-24 16:45:04 UTC (rev 138443)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-24 18:12:09 UTC (rev 138444)
@@ -1,3 +1,13 @@
+2012-12-24 Sam Weinig <[email protected]>
+
+ Fix WebKit2 asserting on launch.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::databaseManager):
+ (WebProcess):
+
2012-12-24 Csaba Osztrogonác <[email protected]>
[Qt][Win] Unreviewed Xmas buildfix after r138433.
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (138443 => 138444)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-24 16:45:04 UTC (rev 138443)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-24 18:12:09 UTC (rev 138444)
@@ -131,9 +131,6 @@
, m_applicationCacheManager(this)
, m_resourceCacheManager(this)
, m_cookieManager(this)
-#if ENABLE(SQL_DATABASE)
- , m_databaseManager(this)
-#endif
#if ENABLE(BATTERY_STATUS)
, m_batteryManager(this)
#endif
@@ -162,6 +159,10 @@
WebKit::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
+#if ENABLE(SQL_DATABASE)
+ m_databaseManager = new WebDatabaseManager(this);
+#endif
+
#if ENABLE(CUSTOM_PROTOCOLS)
CustomProtocolManager::shared().initialize(this);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (138443 => 138444)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-24 16:45:04 UTC (rev 138443)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-24 18:12:09 UTC (rev 138444)
@@ -194,7 +194,7 @@
#if ENABLE(SQL_DATABASE)
// Database
- WebDatabaseManager& databaseManager() { return m_databaseManager; }
+ WebDatabaseManager& databaseManager() { return *m_databaseManager; }
#endif
#if ENABLE(BATTERY_STATUS)
@@ -394,7 +394,7 @@
WebCookieManager m_cookieManager;
#if ENABLE(SQL_DATABASE)
- WebDatabaseManager m_databaseManager;
+ WebDatabaseManager* m_databaseManager;
#endif
#if ENABLE(BATTERY_STATUS)
WebBatteryManager m_batteryManager;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
