Diff
Modified: trunk/Source/WebKit2/ChangeLog (138465 => 138466)
--- trunk/Source/WebKit2/ChangeLog 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-26 01:37:12 UTC (rev 138466)
@@ -1,3 +1,48 @@
+2012-12-24 Sam Weinig <[email protected]>
+
+ Reduce the number of includes in WebProcess.h
+ https://bugs.webkit.org/show_bug.cgi?id=105709
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::NetworkProcess):
+ (WebKit::NetworkProcess::downloadsAuthenticationManager):
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit):
+ * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ * WebProcess/FullScreen/WebFullScreenManager.cpp:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ * WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ * WebProcess/WebPage/FindController.cpp:
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ * WebProcess/WebPage/ca/LayerTreeHostCA.cpp:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::downloadsAuthenticationManager):
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::geolocationManager):
+ (WebKit):
+ (WebKit::WebProcess::applicationCacheManager):
+ (WebKit::WebProcess::resourceCacheManager):
+ (WebKit::WebProcess::cookieManager):
+ (WebKit::WebProcess::authenticationManager):
+ (WebKit::WebProcess::databaseManager):
+ (WebKit::WebProcess::notificationManager):
+ (WebKit::WebProcess::pluginProcessConnectionManager):
+ (WebKit::WebProcess::networkProcessConnectionClosed):
+ (WebKit::WebProcess::webResourceLoadScheduler):
+ (WebKit::WebProcess::pluginProcessCrashed):
+ * WebProcess/WebProcess.h:
+ (WebCore):
+ (WebKit):
+ (WebProcess):
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2012-12-25 Andreas Kling <[email protected]>
[WK2][Mac] Call Carbon resource APIs on main thread only.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (138465 => 138466)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -30,6 +30,7 @@
#include "ArgumentCoders.h"
#include "Attachment.h"
+#include "AuthenticationManager.h"
#include "CustomProtocolManager.h"
#include "Logging.h"
#include "NetworkConnectionToWebProcess.h"
@@ -55,7 +56,7 @@
NetworkProcess::NetworkProcess()
: m_hasSetCacheModel(false)
, m_cacheModel(CacheModelDocumentViewer)
- , m_downloadsAuthenticationManager(this)
+ , m_downloadsAuthenticationManager(new AuthenticationManager(this))
, m_cookieManager(new WebCookieManager(this))
{
#if ENABLE(CUSTOM_PROTOCOLS)
@@ -137,7 +138,7 @@
AuthenticationManager& NetworkProcess::downloadsAuthenticationManager()
{
- return m_downloadsAuthenticationManager;
+ return *m_downloadsAuthenticationManager;
}
void NetworkProcess::initializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (138465 => 138466)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2012-12-26 01:37:12 UTC (rev 138466)
@@ -28,7 +28,6 @@
#if ENABLE(NETWORK_PROCESS)
-#include "AuthenticationManager.h"
#include "CacheModel.h"
#include "ChildProcess.h"
#include "DownloadManager.h"
@@ -42,7 +41,9 @@
namespace WebKit {
+class AuthenticationManager;
class NetworkConnectionToWebProcess;
+class PlatformCertificateInfo;
class WebCookieManager;
struct NetworkProcessCreationParameters;
@@ -113,8 +114,7 @@
bool m_hasSetCacheModel;
CacheModel m_cacheModel;
- AuthenticationManager m_downloadsAuthenticationManager;
-
+ AuthenticationManager* m_downloadsAuthenticationManager;
WebCookieManager* m_cookieManager;
};
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm (138465 => 138466)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm 2012-12-26 01:37:12 UTC (rev 138466)
@@ -28,13 +28,15 @@
#if ENABLE(CUSTOM_PROTOCOLS)
+#import "ChildProcess.h"
#import "CustomProtocolManagerMessages.h"
#import "CustomProtocolManagerProxyMessages.h"
#import "DataReference.h"
#import "WebCoreArgumentCoders.h"
-#import "WebProcess.h"
#import <WebCore/KURL.h>
#import <WebCore/ResourceError.h>
+#import <WebCore/ResourceRequest.h>
+#import <WebCore/ResourceResponse.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (138465 => 138466)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2012-12-26 01:37:12 UTC (rev 138466)
@@ -28,7 +28,6 @@
#import "DynamicLinkerEnvironmentExtractor.h"
#import "EnvironmentVariables.h"
-#import "WebProcess.h"
#import "WebKitSystemInterface.h"
#import <WebCore/RunLoop.h>
#import <crt_externs.h>
Modified: trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -32,7 +32,6 @@
#include "WebCoreArgumentCoders.h"
#include "WebFullScreenManagerProxyMessages.h"
#include "WebPage.h"
-#include "WebProcess.h"
#include <WebCore/Color.h>
#include <WebCore/Element.h>
#include <WebCore/Page.h>
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -35,6 +35,7 @@
#include "WKAPICast.h"
#include "WKBundleAPICast.h"
#include "WebApplicationCacheManager.h"
+#include "WebConnectionToUIProcess.h"
#include "WebContextMessageKinds.h"
#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
@@ -81,6 +82,10 @@
#include "WebSystemInterface.h"
#endif
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+#include "WebNotificationManager.h"
+#endif
+
using namespace WebCore;
using namespace JSC;
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -31,6 +31,7 @@
#include "WebCoreArgumentCoders.h"
#include "WebProcess.h"
#include "WebResourceBuffer.h"
+#include "WebResourceLoadScheduler.h"
#include <WebCore/ResourceBuffer.h>
#if ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -37,6 +37,10 @@
#include <WebCore/SecurityOrigin.h>
#include <WebCore/Settings.h>
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+#include "WebNotificationManager.h"
+#endif
+
using namespace WebCore;
namespace WebKit {
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -47,6 +47,7 @@
#if ENABLE(NETWORK_PROCESS)
#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkProcessConnection.h"
+#include "WebResourceLoadScheduler.h"
#endif
#if PLATFORM(WIN) && USE(CFNETWORK)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -32,7 +32,6 @@
#include "WebCoreArgumentCoders.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
-#include "WebProcess.h"
#include <WebCore/DocumentMarkerController.h>
#include <WebCore/FloatQuad.h>
#include <WebCore/FocusController.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -31,7 +31,6 @@
#include "WebHitTestResult.h"
#include "WebPage.h"
#include "WebPageProxyMessages.h"
-#include "WebProcess.h"
#include <WebCore/ContextMenu.h>
#include <WebCore/ContextMenuController.h>
#include <WebCore/Frame.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -28,7 +28,6 @@
#include "DrawingAreaImpl.h"
#include "WebPage.h"
-#include "WebProcess.h"
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
#include <WebCore/GraphicsLayerCA.h>
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-26 01:37:12 UTC (rev 138466)
@@ -26,16 +26,20 @@
#include "config.h"
#include "WebProcess.h"
-#include "DownloadManager.h"
+#include "AuthenticationManager.h"
#include "InjectedBundle.h"
#include "InjectedBundleUserMessageCoders.h"
#include "Logging.h"
-#include "SandboxExtension.h"
#include "StatisticsData.h"
+#include "WebApplicationCacheManager.h"
+#include "WebConnectionToUIProcess.h"
#include "WebContextMessages.h"
+#include "WebCookieManager.h"
#include "WebCoreArgumentCoders.h"
#include "WebFrame.h"
#include "WebFrameNetworkingContext.h"
+#include "WebGeolocationManager.h"
+#include "WebIconDatabaseProxy.h"
#include "WebKeyValueStorageManager.h"
#include "WebMediaCacheManager.h"
#include "WebMemorySampler.h"
@@ -46,6 +50,7 @@
#include "WebProcessCreationParameters.h"
#include "WebProcessMessages.h"
#include "WebProcessProxyMessages.h"
+#include "WebResourceCacheManager.h"
#include <_javascript_Core/JSLock.h>
#include <_javascript_Core/MemoryStatistics.h>
#include <WebCore/AXObjectCache.h>
@@ -74,7 +79,6 @@
#include <WebCore/StorageTracker.h>
#include <wtf/HashCountedSet.h>
#include <wtf/PassRefPtr.h>
-#include <wtf/RandomNumber.h>
#if ENABLE(WEB_INTENTS)
#include <WebCore/PlatformMessagePortChannel.h>
@@ -100,6 +104,22 @@
#include "CustomProtocolManager.h"
#endif
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+#include "WebNotificationManager.h"
+#endif
+
+#if ENABLE(SQL_DATABASE)
+#include "WebDatabaseManager.h"
+#endif
+
+#if ENABLE(NETWORK_PROCESS)
+#include "WebResourceLoadScheduler.h"
+#endif
+
+#if ENABLE(PLUGIN_PROCESS)
+#include "PluginProcessConnectionManager.h"
+#endif
+
using namespace JSC;
using namespace WebCore;
@@ -127,12 +147,13 @@
, m_networkAccessManager(0)
#endif
, m_textCheckerState()
- , m_geolocationManager(this)
- , m_applicationCacheManager(this)
- , m_resourceCacheManager(this)
- , m_cookieManager(this)
+ , m_geolocationManager(new WebGeolocationManager(this))
+ , m_applicationCacheManager(new WebApplicationCacheManager(this))
+ , m_resourceCacheManager(new WebResourceCacheManager(this))
+ , m_cookieManager(new WebCookieManager(this))
+ , m_authenticationManager(new AuthenticationManager(this))
#if ENABLE(SQL_DATABASE)
- , m_databaseManager(0)
+ , m_databaseManager(new WebDatabaseManager(this))
#endif
#if ENABLE(BATTERY_STATUS)
, m_batteryManager(this)
@@ -141,16 +162,19 @@
, m_networkInfoManager(this)
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- , m_notificationManager(this)
+ , m_notificationManager(new WebNotificationManager(this))
#endif
- , m_iconDatabaseProxy(this)
+ , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
#if ENABLE(NETWORK_PROCESS)
, m_usesNetworkProcess(false)
+ , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
#endif
+#if ENABLE(PLUGIN_PROCESS)
+ , m_pluginProcessConnectionManager(new PluginProcessConnectionManager)
+#endif
#if USE(SOUP)
, m_soupRequestManager(this)
#endif
- , m_authenticationManager(this)
{
#if USE(PLATFORM_STRATEGIES)
// Initialize our platform strategies.
@@ -201,7 +225,7 @@
AuthenticationManager& WebProcess::downloadsAuthenticationManager()
{
- return m_authenticationManager;
+ return *m_authenticationManager;
}
void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::MessageDecoder& decoder)
@@ -234,7 +258,7 @@
#endif
#if ENABLE(ICONDATABASE)
- m_iconDatabaseProxy.setEnabled(parameters.iconDatabaseEnabled);
+ m_iconDatabaseProxy->setEnabled(parameters.iconDatabaseEnabled);
#endif
StorageTracker::initializeTracker(parameters.localStorageDirectory, &WebKeyValueStorageManager::shared());
@@ -407,6 +431,26 @@
#endif
}
+WebGeolocationManager& WebProcess::geolocationManager()
+{
+ return *m_geolocationManager;
+}
+
+WebApplicationCacheManager& WebProcess::applicationCacheManager()
+{
+ return *m_applicationCacheManager;
+}
+
+WebResourceCacheManager& WebProcess::resourceCacheManager()
+{
+ return *m_resourceCacheManager;
+}
+
+WebCookieManager& WebProcess::cookieManager()
+{
+ return *m_cookieManager;
+}
+
DownloadManager& WebProcess::downloadManager()
{
#if ENABLE(NETWORK_PROCESS)
@@ -417,6 +461,32 @@
return downloadManager;
}
+AuthenticationManager& WebProcess::authenticationManager()
+{
+ return *m_authenticationManager;
+}
+
+#if ENABLE(SQL_DATABASE)
+WebDatabaseManager& WebProcess::databaseManager()
+{
+ return *m_databaseManager;
+}
+#endif
+
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+WebNotificationManager& WebProcess::notificationManager()
+{
+ return *m_notificationManager;
+}
+#endif
+
+#if ENABLE(PLUGIN_PROCESS)
+PluginProcessConnectionManager& WebProcess::pluginProcessConnectionManager()
+{
+ return *m_pluginProcessConnectionManager;
+}
+#endif
+
void WebProcess::setVisitedLinkTable(const SharedMemory::Handle& handle)
{
RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::ReadOnly);
@@ -962,14 +1032,20 @@
m_networkProcessConnection = 0;
- m_webResourceLoadScheduler.networkProcessCrashed();
+ m_webResourceLoadScheduler->networkProcessCrashed();
}
+
+WebResourceLoadScheduler& WebProcess::webResourceLoadScheduler()
+{
+ return *m_webResourceLoadScheduler;
+}
+
#endif
#if ENABLE(PLUGIN_PROCESS)
void WebProcess::pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath, uint32_t processType)
{
- m_pluginProcessConnectionManager.pluginProcessCrashed(pluginPath, static_cast<PluginProcess::Type>(processType));
+ m_pluginProcessConnectionManager->pluginProcessCrashed(pluginPath, static_cast<PluginProcess::Type>(processType));
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-12-26 01:37:12 UTC (rev 138466)
@@ -26,26 +26,15 @@
#ifndef WebProcess_h
#define WebProcess_h
-#include "AuthenticationManager.h"
#include "CacheModel.h"
#include "ChildProcess.h"
#include "DownloadManager.h"
-#include "DrawingArea.h"
#include "EventDispatcher.h"
-#include "MessageReceiverMap.h"
-#include "PluginInfoStore.h"
#include "ResourceCachesToClear.h"
#include "SandboxExtension.h"
#include "SharedMemory.h"
#include "TextCheckerState.h"
#include "VisitedLinkTable.h"
-#include "WebApplicationCacheManager.h"
-#include "WebConnectionToUIProcess.h"
-#include "WebCookieManager.h"
-#include "WebGeolocationManager.h"
-#include "WebIconDatabaseProxy.h"
-#include "WebPageGroupProxy.h"
-#include "WebResourceCacheManager.h"
#include <WebCore/LinkHash.h>
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
@@ -73,37 +62,29 @@
#include "WebNetworkInfoManager.h"
#endif
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-#include "WebNotificationManager.h"
-#endif
-
-#if ENABLE(NETWORK_PROCESS)
-#include "WebResourceLoadScheduler.h"
-#endif
-
-#if ENABLE(PLUGIN_PROCESS)
-#include "PluginProcessConnectionManager.h"
-#endif
-
-#if ENABLE(SQL_DATABASE)
-#include "WebDatabaseManager.h"
-#endif
-
namespace WebCore {
- class IntSize;
- class PageGroup;
+ class ResourceRequest;
+ struct PluginInfo;
+
#if ENABLE(WEB_INTENTS)
class PlatformMessagePortChannel;
#endif
- class ResourceRequest;
- class ResourceResponse;
}
namespace WebKit {
+class AuthenticationManager;
+class DownloadManager;
class InjectedBundle;
+class WebApplicationCacheManager;
+class WebConnectionToUIProcess;
+class WebCookieManager;
class WebFrame;
+class WebGeolocationManager;
+class WebIconDatabaseProxy;
class WebPage;
+class WebPageGroupProxy;
+class WebResourceCacheManager;
struct WebPageCreationParameters;
struct WebPageGroupData;
struct WebPreferencesStore;
@@ -117,6 +98,22 @@
class SecItemResponseData;
#endif
+#if ENABLE(SQL_DATABASE)
+class WebDatabaseManager;
+#endif
+
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+class WebNotificationManager;
+#endif
+
+#if ENABLE(NETWORK_PROCESS)
+class WebResourceLoadScheduler;
+#endif
+
+#if ENABLE(PLUGIN_PROCESS)
+class PluginProcessConnectionManager;
+#endif
+
class WebProcess : public ChildProcess, private CoreIPC::Connection::QueueClient, private DownloadManager::Client {
public:
static WebProcess& shared();
@@ -168,6 +165,7 @@
WebPageGroupProxy* webPageGroup(uint64_t pageGroupID);
WebPageGroupProxy* webPageGroup(const WebPageGroupData&);
+
#if PLATFORM(MAC)
pid_t presenterApplicationPid() const { return m_presenterApplicationPid; }
bool shouldForceScreenFontSubstitution() const { return m_shouldForceScreenFontSubstitution; }
@@ -177,24 +175,17 @@
QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; }
#endif
- // Text Checking
const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
- // Geolocation
- WebGeolocationManager& geolocationManager() { return m_geolocationManager; }
+ WebGeolocationManager& geolocationManager();
+ WebApplicationCacheManager& applicationCacheManager();
+ WebResourceCacheManager& resourceCacheManager();
+ WebCookieManager& cookieManager();
+ DownloadManager& downloadManager();
+ AuthenticationManager& authenticationManager();
- // Application Cache
- WebApplicationCacheManager& applicationCacheManager() { return m_applicationCacheManager; }
-
- // Resource Cache
- WebResourceCacheManager& resourceCacheManager() { return m_resourceCacheManager; }
-
- // Cookies
- WebCookieManager& cookieManager() { return m_cookieManager; }
-
#if ENABLE(SQL_DATABASE)
- // Database
- WebDatabaseManager& databaseManager() { return *m_databaseManager; }
+ WebDatabaseManager& databaseManager();
#endif
#if ENABLE(BATTERY_STATUS)
@@ -206,7 +197,7 @@
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- WebNotificationManager& notificationManager() { return m_notificationManager; }
+ WebNotificationManager& notificationManager();
#endif
void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
@@ -214,7 +205,7 @@
const String& localStorageDirectory() const { return m_localStorageDirectory; }
#if ENABLE(PLUGIN_PROCESS)
- PluginProcessConnectionManager& pluginProcessConnectionManager() { return m_pluginProcessConnectionManager; }
+ PluginProcessConnectionManager& pluginProcessConnectionManager();
#endif
EventDispatcher& eventDispatcher() { return m_eventDispatcher; }
@@ -227,7 +218,7 @@
NetworkProcessConnection* networkConnection();
void networkProcessConnectionClosed(NetworkProcessConnection*);
bool usesNetworkProcess() const { return m_usesNetworkProcess; }
- WebResourceLoadScheduler& webResourceLoadScheduler() { return m_webResourceLoadScheduler; }
+ WebResourceLoadScheduler& webResourceLoadScheduler();
#endif
void setCacheModel(uint32_t);
@@ -235,9 +226,6 @@
void ensurePrivateBrowsingSession();
void destroyPrivateBrowsingSession();
- DownloadManager& downloadManager();
- AuthenticationManager& authenticationManager() { return m_authenticationManager; }
-
private:
WebProcess();
@@ -388,11 +376,11 @@
#endif
TextCheckerState m_textCheckerState;
- WebGeolocationManager m_geolocationManager;
- WebApplicationCacheManager m_applicationCacheManager;
- WebResourceCacheManager m_resourceCacheManager;
- WebCookieManager m_cookieManager;
-
+ WebGeolocationManager* m_geolocationManager;
+ WebApplicationCacheManager* m_applicationCacheManager;
+ WebResourceCacheManager* m_resourceCacheManager;
+ WebCookieManager* m_cookieManager;
+ AuthenticationManager* m_authenticationManager;
#if ENABLE(SQL_DATABASE)
WebDatabaseManager* m_databaseManager;
#endif
@@ -403,9 +391,9 @@
WebNetworkInfoManager m_networkInfoManager;
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- WebNotificationManager m_notificationManager;
+ WebNotificationManager* m_notificationManager;
#endif
- WebIconDatabaseProxy m_iconDatabaseProxy;
+ WebIconDatabaseProxy* m_iconDatabaseProxy;
String m_localStorageDirectory;
@@ -413,18 +401,16 @@
void ensureNetworkProcessConnection();
RefPtr<NetworkProcessConnection> m_networkProcessConnection;
bool m_usesNetworkProcess;
- WebResourceLoadScheduler m_webResourceLoadScheduler;
+ WebResourceLoadScheduler* m_webResourceLoadScheduler;
#endif
#if ENABLE(PLUGIN_PROCESS)
- PluginProcessConnectionManager m_pluginProcessConnectionManager;
+ PluginProcessConnectionManager* m_pluginProcessConnectionManager;
#endif
#if USE(SOUP)
WebSoupRequestManager m_soupRequestManager;
#endif
-
- AuthenticationManager m_authenticationManager;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (138465 => 138466)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2012-12-25 21:07:53 UTC (rev 138465)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2012-12-26 01:37:12 UTC (rev 138466)
@@ -48,6 +48,10 @@
#import <objc/runtime.h>
#import <stdio.h>
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+#include "WebNotificationManager.h"
+#endif
+
#if ENABLE(WEB_PROCESS_SANDBOX)
#import <pwd.h>
#import <stdlib.h>
@@ -290,7 +294,7 @@
m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- m_notificationManager.initialize(parameters.notificationPermissions);
+ m_notificationManager->initialize(parameters.notificationPermissions);
#endif
m_presenterApplicationPid = parameters.presenterApplicationPid;
