diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-11 13:45:28 +0200 |
| commit | d6a599dbc9d824a462b2b206316e102bf8136446 (patch) | |
| tree | ecb257a5e55b2239d74b90fdad62fccd661cf286 /Source/WebKit2/WebProcess/WebProcess.cpp | |
| parent | 3ccc3a85f09a83557b391aae380d3bf5f81a2911 (diff) | |
| download | qtwebkit-d6a599dbc9d824a462b2b206316e102bf8136446.tar.gz | |
Imported WebKit commit 8ff1f22783a32de82fee915abd55bd1b298f2644 (http://svn.webkit.org/repository/webkit/trunk@122325)
New snapshot that should work with the latest Qt build system changes
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp index 2b0382dba..3a9940442 100644 --- a/Source/WebKit2/WebProcess/WebProcess.cpp +++ b/Source/WebKit2/WebProcess/WebProcess.cpp @@ -80,6 +80,10 @@ #include <wtf/PassRefPtr.h> #include <wtf/RandomNumber.h> +#if ENABLE(NETWORK_INFO) +#include "WebNetworkInfoManagerMessages.h" +#endif + #if !OS(WINDOWS) #include <unistd.h> #endif @@ -145,6 +149,12 @@ WebProcess::WebProcess() #endif , m_textCheckerState() , m_geolocationManager(this) +#if ENABLE(BATTERY_STATUS) + , m_batteryManager(this) +#endif +#if ENABLE(NETWORK_INFO) + , m_networkInfoManager(this) +#endif #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) , m_notificationManager(this) #endif @@ -161,7 +171,9 @@ WebProcess::WebProcess() WebPlatformStrategies::initialize(); #endif // USE(PLATFORM_STRATEGIES) +#if !LOG_DISABLED WebCore::initializeLoggingChannelsIfNecessary(); +#endif // !LOG_DISABLED } void WebProcess::initialize(CoreIPC::Connection::Identifier serverIdentifier, RunLoop* runLoop) @@ -631,6 +643,20 @@ void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Mes return; } +#if ENABLE(BATTERY_STATUS) + if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) { + m_batteryManager.didReceiveMessage(connection, messageID, arguments); + return; + } +#endif + +#if ENABLE(NETWORK_INFO) + if (messageID.is<CoreIPC::MessageClassWebNetworkInfoManager>()) { + m_networkInfoManager.didReceiveMessage(connection, messageID, arguments); + return; + } +#endif + if (messageID.is<CoreIPC::MessageClassWebIconDatabaseProxy>()) { m_iconDatabaseProxy.didReceiveMessage(connection, messageID, arguments); return; @@ -920,7 +946,7 @@ void WebProcess::getWebCoreStatistics(uint64_t callbackID) // Gather JavaScript statistics. { - JSLock lock(SilenceAssertionsOnly); + JSLockHolder lock(JSDOMWindow::commonJSGlobalData()); data.statisticsNumbers.set("JavaScriptObjectsCount", JSDOMWindow::commonJSGlobalData()->heap.objectCount()); data.statisticsNumbers.set("JavaScriptGlobalObjectsCount", JSDOMWindow::commonJSGlobalData()->heap.globalObjectCount()); data.statisticsNumbers.set("JavaScriptProtectedObjectsCount", JSDOMWindow::commonJSGlobalData()->heap.protectedObjectCount()); |