Diff
Modified: trunk/Source/WebKit2/ChangeLog (132365 => 132366)
--- trunk/Source/WebKit2/ChangeLog 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-24 17:22:19 UTC (rev 132366)
@@ -1,3 +1,34 @@
+2012-10-23 Sam Weinig <s...@webkit.org>
+
+ Move a few more WebProcess sub-objects to be MessageReceivers
+ https://bugs.webkit.org/show_bug.cgi?id=100186
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/Battery/WebBatteryManager.cpp:
+ (WebKit::WebBatteryManager::WebBatteryManager):
+ * WebProcess/Battery/WebBatteryManager.h:
+ (WebBatteryManager):
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.cpp:
+ (WebKit::WebIconDatabaseProxy::WebIconDatabaseProxy):
+ (WebKit):
+ * WebProcess/IconDatabase/WebIconDatabaseProxy.h:
+ (WebIconDatabaseProxy):
+ * WebProcess/NetworkInfo/WebNetworkInfoManager.cpp:
+ (WebKit::WebNetworkInfoManager::WebNetworkInfoManager):
+ * WebProcess/NetworkInfo/WebNetworkInfoManager.h:
+ (WebNetworkInfoManager):
+ * WebProcess/Notifications/WebNotificationManager.cpp:
+ (WebKit::WebNotificationManager::WebNotificationManager):
+ * WebProcess/Notifications/WebNotificationManager.h:
+ (WebNotificationManager):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didReceiveMessage):
+ * WebProcess/soup/WebSoupRequestManager.cpp:
+ (WebKit::WebSoupRequestManager::WebSoupRequestManager):
+ * WebProcess/soup/WebSoupRequestManager.h:
+ (WebSoupRequestManager):
+
2012-10-23 Anders Carlsson <ander...@apple.com>
encode should take an ArgumentEncoder reference
Modified: trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -28,6 +28,7 @@
#if ENABLE(BATTERY_STATUS)
+#include "WebBatteryManagerMessages.h"
#include "WebBatteryManagerProxyMessages.h"
#include "WebPage.h"
#include "WebProcess.h"
@@ -42,6 +43,7 @@
WebBatteryManager::WebBatteryManager(WebProcess* process)
: m_process(process)
{
+ m_process->addMessageReceiver(Messages::WebBatteryManager::messageReceiverName(), this);
}
WebBatteryManager::~WebBatteryManager()
Modified: trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.h (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.h 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/Battery/WebBatteryManager.h 2012-10-24 17:22:19 UTC (rev 132366)
@@ -28,24 +28,19 @@
#if ENABLE(BATTERY_STATUS)
-#include "MessageID.h"
+#include "MessageReceiver.h"
#include "WebBatteryStatus.h"
#include "WebCoreArgumentCoders.h"
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/text/AtomicString.h>
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-}
-
namespace WebKit {
class WebPage;
class WebProcess;
-class WebBatteryManager {
+class WebBatteryManager : private CoreIPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebBatteryManager);
public:
@@ -58,9 +53,10 @@
void didChangeBatteryStatus(const WTF::AtomicString& eventType, const WebBatteryStatus::Data&);
void updateBatteryStatus(const WebBatteryStatus::Data&);
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
-
private:
+ // CoreIPC::MessageReceiver
+ void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
+
// Implemented in generated WebBatteryManagerMessageReceiver.cpp
void didReceiveWebBatteryManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -27,8 +27,8 @@
#include "WebIconDatabaseProxy.h"
#include "DataReference.h"
-#include "MessageID.h"
#include "WebIconDatabaseMessages.h"
+#include "WebIconDatabaseProxyMessages.h"
#include "WebProcess.h"
#include <WebCore/SharedBuffer.h>
#include <wtf/text/WTFString.h>
@@ -45,6 +45,7 @@
: m_isEnabled(false)
, m_process(process)
{
+ m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), this);
}
bool WebIconDatabaseProxy::isEnabled() const
@@ -61,7 +62,6 @@
setGlobalIconDatabase(enabled ? this : 0);
}
-
void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL)
{
m_process->connection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0);
Modified: trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h 2012-10-24 17:22:19 UTC (rev 132366)
@@ -27,33 +27,25 @@
#define WebIconDatabaseProxy_h
#include "APIObject.h"
-
+#include "MessageReceiver.h"
#include <WebCore/IconDatabaseBase.h>
-
#include <wtf/HashMap.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-class MessageID;
-}
-
namespace WebKit {
class WebProcess;
-class WebIconDatabaseProxy : public WebCore::IconDatabaseBase {
+class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private CoreIPC::MessageReceiver {
public:
explicit WebIconDatabaseProxy(WebProcess*);
virtual ~WebIconDatabaseProxy();
virtual bool isEnabled() const;
void setEnabled(bool);
-
-
+
virtual void retainIconForPageURL(const String&);
virtual void releaseIconForPageURL(const String&);
virtual void setIconURLForPageURL(const String&, const String&);
@@ -69,10 +61,12 @@
virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>);
void receivedIconLoadDecision(int decision, uint64_t callbackID);
virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
-
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
-
+
private:
+ // CoreIPC::MessageReceiver
+ void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
+
+ // Implemented in generated WebIconDatabaseProxyMessageReceiver.cpp
void didReceiveWebIconDatabaseProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
// Callbacks from the UIProcess
Modified: trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -28,6 +28,7 @@
#if ENABLE(NETWORK_INFO)
+#include "WebNetworkInfoManagerMessages.h"
#include "WebNetworkInfoManagerProxyMessages.h"
#include "WebPage.h"
#include "WebProcess.h"
@@ -42,6 +43,7 @@
WebNetworkInfoManager::WebNetworkInfoManager(WebProcess* process)
: m_process(process)
{
+ m_process->addMessageReceiver(Messages::WebNetworkInfoManager::messageReceiverName(), this);
}
WebNetworkInfoManager::~WebNetworkInfoManager()
Modified: trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h 2012-10-24 17:22:19 UTC (rev 132366)
@@ -28,24 +28,19 @@
#if ENABLE(NETWORK_INFO)
-#include "MessageID.h"
+#include "MessageReceiver.h"
#include "WebCoreArgumentCoders.h"
#include "WebNetworkInfo.h"
#include <wtf/HashSet.h>
#include <wtf/Noncopyable.h>
#include <wtf/text/AtomicString.h>
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-}
-
namespace WebKit {
class WebProcess;
class WebPage;
-class WebNetworkInfoManager {
+class WebNetworkInfoManager : private CoreIPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebNetworkInfoManager);
public:
explicit WebNetworkInfoManager(WebProcess*);
@@ -56,10 +51,10 @@
double bandwidth(WebPage*) const;
bool metered(WebPage*) const;
-
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
-
private:
+ // CoreIPC::MessageReceiver
+ void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
+
// Implemented in generated WebNetworkInfoManagerMessageReceiver.cpp
void didReceiveWebNetworkInfoManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -31,6 +31,7 @@
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
#include "WebNotification.h"
+#include "WebNotificationManagerMessages.h"
#include "WebNotificationManagerProxyMessages.h"
#include "WebPageProxyMessages.h"
#include <WebCore/Document.h>
@@ -57,6 +58,9 @@
WebNotificationManager::WebNotificationManager(WebProcess* process)
: m_process(process)
{
+#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
+ m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), this);
+#endif
}
WebNotificationManager::~WebNotificationManager()
Modified: trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h 2012-10-24 17:22:19 UTC (rev 132366)
@@ -26,7 +26,7 @@
#ifndef WebNotificationManager_h
#define WebNotificationManager_h
-#include "MessageID.h"
+#include "MessageReceiver.h"
#include <WebCore/NotificationClient.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
@@ -34,11 +34,6 @@
#include <wtf/Vector.h>
#include <wtf/text/StringHash.h>
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-}
-
namespace WebCore {
class Notification;
class SecurityOrigin;
@@ -49,7 +44,7 @@
class WebPage;
class WebProcess;
-class WebNotificationManager {
+class WebNotificationManager : private CoreIPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebNotificationManager);
public:
explicit WebNotificationManager(WebProcess*);
@@ -63,7 +58,6 @@
// This callback comes from WebCore, not messaged from the UI process.
void didDestroyNotification(WebCore::Notification*, WebPage*);
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
void didUpdateNotificationDecision(const String& originString, bool allowed);
// Looks in local cache for permission. If not found, returns DefaultDenied.
@@ -73,6 +67,9 @@
uint64_t notificationIDForTesting(WebCore::Notification*);
private:
+ // CoreIPC::MessageReceiver
+ void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
+
// Implemented in generated WebNotificationManagerMessageReceiver.cpp
void didReceiveWebNotificationManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -692,25 +692,6 @@
}
#endif
-#if ENABLE(BATTERY_STATUS)
- if (messageID.is<CoreIPC::MessageClassWebBatteryManager>()) {
- m_batteryManager.didReceiveMessage(connection, messageID, decoder);
- return;
- }
-#endif
-
-#if ENABLE(NETWORK_INFO)
- if (messageID.is<CoreIPC::MessageClassWebNetworkInfoManager>()) {
- m_networkInfoManager.didReceiveMessage(connection, messageID, decoder);
- return;
- }
-#endif
-
- if (messageID.is<CoreIPC::MessageClassWebIconDatabaseProxy>()) {
- m_iconDatabaseProxy.didReceiveMessage(connection, messageID, decoder);
- return;
- }
-
if (messageID.is<CoreIPC::MessageClassWebKeyValueStorageManager>()) {
WebKeyValueStorageManager::shared().didReceiveMessage(connection, messageID, decoder);
return;
@@ -720,25 +701,11 @@
WebMediaCacheManager::shared().didReceiveMessage(connection, messageID, decoder);
return;
}
-
-#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
- if (messageID.is<CoreIPC::MessageClassWebNotificationManager>()) {
- m_notificationManager.didReceiveMessage(connection, messageID, decoder);
- return;
- }
-#endif
if (messageID.is<CoreIPC::MessageClassWebResourceCacheManager>()) {
WebResourceCacheManager::shared().didReceiveMessage(connection, messageID, decoder);
return;
}
-
-#if USE(SOUP)
- if (messageID.is<CoreIPC::MessageClassWebSoupRequestManager>()) {
- m_soupRequestManager.didReceiveMessage(connection, messageID, decoder);
- return;
- }
-#endif
if (messageID.is<CoreIPC::MessageClassWebPageGroupProxy>()) {
uint64_t pageGroupID = decoder.destinationID();
Modified: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2012-10-24 17:22:19 UTC (rev 132366)
@@ -27,6 +27,7 @@
#include "WebKitSoupRequestInputStream.h"
#include "WebPageProxyMessages.h"
#include "WebProcess.h"
+#include "WebSoupRequestManagerMessages.h"
#include "WebSoupRequestManagerProxyMessages.h"
#include <WebCore/ResourceHandle.h>
#include <WebCore/ResourceRequest.h>
@@ -80,6 +81,7 @@
: m_process(process)
, m_schemes(adoptGRef(g_ptr_array_new_with_free_func(g_free)))
{
+ m_process->addMessageReceiver(Messages::WebSoupRequestManager::messageReceiverName(), this);
}
WebSoupRequestManager::~WebSoupRequestManager()
Modified: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h (132365 => 132366)
--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2012-10-24 17:20:41 UTC (rev 132365)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2012-10-24 17:22:19 UTC (rev 132366)
@@ -20,6 +20,8 @@
#ifndef WebSoupRequestManager_h
#define WebSoupRequestManager_h
+#include "DataReference.h"
+#include "MessageReceiver.h"
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
@@ -29,19 +31,12 @@
typedef struct _GInputStream GInputStream;
typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
-namespace CoreIPC {
-class Connection;
-class DataReference;
-class MessageDecoder;
-class MessageID;
-}
-
namespace WebKit {
class WebProcess;
struct WebSoupRequestAsyncData;
-class WebSoupRequestManager {
+class WebSoupRequestManager : private CoreIPC::MessageReceiver {
WTF_MAKE_NONCOPYABLE(WebSoupRequestManager);
public:
explicit WebSoupRequestManager(WebProcess*);
@@ -50,9 +45,11 @@
void send(GSimpleAsyncResult*, GCancellable*);
GInputStream* finish(GSimpleAsyncResult*);
- void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
-
private:
+ // CoreIPC::MessageReceiver
+ void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
+
+ // Implemented in generated WebSoupRequestManagerMessageReceiver.cpp
void didReceiveWebSoupRequestManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
void registerURIScheme(const String& scheme);
