Diff
Modified: trunk/Source/WebKit2/ChangeLog (131840 => 131841)
--- trunk/Source/WebKit2/ChangeLog 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-19 02:29:23 UTC (rev 131841)
@@ -1,3 +1,50 @@
+2012-10-18 Anders Carlsson <ander...@apple.com>
+
+ Deprecate the current version of MessageReceiverMap::addMessageReceiver
+ https://bugs.webkit.org/show_bug.cgi?id=99797
+
+ Reviewed by Andreas Kling.
+
+ Rename addMessageReceiver to deprecatedAddMessageReceiver in preparation for adding a new
+ version that takes a string instead.
+
+ * Platform/CoreIPC/Connection.h:
+ (CoreIPC::Connection::deprecatedAddMessageReceiver):
+ * Platform/CoreIPC/MessageReceiverMap.cpp:
+ (CoreIPC::MessageReceiverMap::deprecatedAddMessageReceiver):
+ (CoreIPC::MessageReceiverMap::invalidate):
+ (CoreIPC::MessageReceiverMap::dispatchMessage):
+ (CoreIPC::MessageReceiverMap::dispatchSyncMessage):
+ * Platform/CoreIPC/MessageReceiverMap.h:
+ (MessageReceiverMap):
+ * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
+ (WebKit::WebNotificationManagerProxy::WebNotificationManagerProxy):
+ * UIProcess/WebApplicationCacheManagerProxy.cpp:
+ (WebKit::WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::deprecatedAddMessageReceiver):
+ * UIProcess/WebContext.h:
+ (WebContext):
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::WebCookieManagerProxy):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::WebDatabaseManagerProxy):
+ * UIProcess/WebGeolocationManagerProxy.cpp:
+ (WebKit::WebGeolocationManagerProxy::WebGeolocationManagerProxy):
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::WebIconDatabase):
+ * UIProcess/WebKeyValueStorageManagerProxy.cpp:
+ (WebKit::WebKeyValueStorageManagerProxy::WebKeyValueStorageManagerProxy):
+ * UIProcess/WebMediaCacheManagerProxy.cpp:
+ (WebKit::WebMediaCacheManagerProxy::WebMediaCacheManagerProxy):
+ * UIProcess/WebResourceCacheManagerProxy.cpp:
+ (WebKit::WebResourceCacheManagerProxy::WebResourceCacheManagerProxy):
+ * WebProcess/Authentication/AuthenticationManager.cpp:
+ (WebKit::AuthenticationManager::AuthenticationManager):
+ * WebProcess/Geolocation/WebGeolocationManager.cpp:
+ (WebKit::WebGeolocationManager::registerWebPage):
+
2012-10-18 Chris Fleizach <cfleiz...@apple.com>
AX: Crashes in WebProcess at com.apple.WebCore: -[AccessibilityObjectWrapper remoteAccessibilityParentObject] + 78
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (131840 => 131841)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-10-19 02:29:23 UTC (rev 131841)
@@ -174,9 +174,9 @@
void addQueueClient(QueueClient*);
void removeQueueClient(QueueClient*);
- void addMessageReceiver(MessageClass messageClass, MessageReceiver* messageReceiver)
+ void deprecatedAddMessageReceiver(MessageClass messageClass, MessageReceiver* messageReceiver)
{
- m_messageReceiverMap.addMessageReceiver(messageClass, messageReceiver);
+ m_messageReceiverMap.deprecatedAddMessageReceiver(messageClass, messageReceiver);
}
bool open();
Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp (131840 => 131841)
--- trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -38,25 +38,20 @@
{
}
-void MessageReceiverMap::addMessageReceiver(MessageClass messageClass, MessageReceiver* messageReceiver)
+void MessageReceiverMap::deprecatedAddMessageReceiver(MessageClass messageClass, MessageReceiver* messageReceiver)
{
- ASSERT(!m_globalMessageReceivers.contains(messageClass));
- m_globalMessageReceivers.set(messageClass, messageReceiver);
+ ASSERT(!m_deprecatedGlobalMessageReceivers.contains(messageClass));
+ m_deprecatedGlobalMessageReceivers.set(messageClass, messageReceiver);
}
void MessageReceiverMap::invalidate()
{
- m_globalMessageReceivers.clear();
+ m_deprecatedGlobalMessageReceivers.clear();
}
-bool MessageReceiverMap::knowsHowToHandleMessage(MessageID messageID) const
-{
- return m_globalMessageReceivers.contains(messageID.messageClass());
-}
-
bool MessageReceiverMap::dispatchMessage(Connection* connection, MessageID messageID, MessageDecoder& decoder)
{
- if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(messageID.messageClass())) {
+ if (MessageReceiver* messageReceiver = m_deprecatedGlobalMessageReceivers.get(messageID.messageClass())) {
messageReceiver->didReceiveMessage(connection, messageID, decoder);
return true;
}
@@ -66,7 +61,7 @@
bool MessageReceiverMap::dispatchSyncMessage(Connection* connection, MessageID messageID, MessageDecoder& decoder, OwnPtr<MessageEncoder>& replyEncoder)
{
- if (MessageReceiver* messageReceiver = m_globalMessageReceivers.get(messageID.messageClass())) {
+ if (MessageReceiver* messageReceiver = m_deprecatedGlobalMessageReceivers.get(messageID.messageClass())) {
messageReceiver->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
return true;
}
Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h (131840 => 131841)
--- trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h 2012-10-19 02:29:23 UTC (rev 131841)
@@ -27,8 +27,8 @@
#define MessageReceiverMap_h
#include "MessageID.h"
-#include <wtf/Forward.h>
#include <wtf/HashMap.h>
+#include <wtf/text/CString.h>
namespace CoreIPC {
@@ -42,17 +42,17 @@
MessageReceiverMap();
~MessageReceiverMap();
- void addMessageReceiver(MessageClass, MessageReceiver*);
+ // FIXME: Stop using this deprecated function and get rid of it.
+ void deprecatedAddMessageReceiver(MessageClass, MessageReceiver*);
void invalidate();
- bool knowsHowToHandleMessage(MessageID) const;
bool dispatchMessage(Connection*, MessageID, MessageDecoder&);
bool dispatchSyncMessage(Connection*, MessageID, MessageDecoder&, OwnPtr<MessageEncoder>&);
private:
// Message receivers that don't require a destination ID.
- HashMap<unsigned, MessageReceiver*> m_globalMessageReceivers;
+ HashMap<unsigned, MessageReceiver*> m_deprecatedGlobalMessageReceivers;
};
};
Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -47,7 +47,7 @@
WebNotificationManagerProxy::WebNotificationManagerProxy(WebContext* context)
: m_context(context)
{
- m_context->addMessageReceiver(CoreIPC::MessageClassWebNotificationManagerProxy, this);
+ m_context->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebNotificationManagerProxy, this);
}
void WebNotificationManagerProxy::invalidate()
Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -41,7 +41,7 @@
WebApplicationCacheManagerProxy::WebApplicationCacheManagerProxy(WebContext* context)
: m_webContext(context)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebApplicationCacheManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebApplicationCacheManagerProxy, this);
}
WebApplicationCacheManagerProxy::~WebApplicationCacheManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -129,9 +129,9 @@
, m_usesNetworkProcess(false)
#endif
{
- addMessageReceiver(CoreIPC::MessageClassWebContext, this);
- addMessageReceiver(CoreIPC::MessageClassDownloadProxy, this);
- addMessageReceiver(CoreIPC::MessageClassWebContextLegacy, this);
+ deprecatedAddMessageReceiver(CoreIPC::MessageClassWebContext, this);
+ deprecatedAddMessageReceiver(CoreIPC::MessageClassDownloadProxy, this);
+ deprecatedAddMessageReceiver(CoreIPC::MessageClassWebContextLegacy, this);
// NOTE: These sub-objects must be initialized after m_messageReceiverMap..
m_applicationCacheManagerProxy = WebApplicationCacheManagerProxy::create(this);
@@ -777,9 +777,9 @@
return mimeTypes;
}
-void WebContext::addMessageReceiver(CoreIPC::MessageClass messageClass, CoreIPC::MessageReceiver* messageReceiver)
+void WebContext::deprecatedAddMessageReceiver(CoreIPC::MessageClass messageClass, CoreIPC::MessageReceiver* messageReceiver)
{
- m_messageReceiverMap.addMessageReceiver(messageClass, messageReceiver);
+ m_messageReceiverMap.deprecatedAddMessageReceiver(messageClass, messageReceiver);
}
bool WebContext::dispatchMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2012-10-19 02:29:23 UTC (rev 131841)
@@ -90,7 +90,7 @@
static const Vector<WebContext*>& allContexts();
- void addMessageReceiver(CoreIPC::MessageClass, CoreIPC::MessageReceiver*);
+ void deprecatedAddMessageReceiver(CoreIPC::MessageClass, CoreIPC::MessageReceiver*);
bool dispatchMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
bool dispatchSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -41,7 +41,7 @@
WebCookieManagerProxy::WebCookieManagerProxy(WebContext* context)
: m_webContext(context)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebCookieManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebCookieManagerProxy, this);
}
WebCookieManagerProxy::~WebCookieManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -94,7 +94,7 @@
WebDatabaseManagerProxy::WebDatabaseManagerProxy(WebContext* webContext)
: m_webContext(webContext)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebDatabaseManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebDatabaseManagerProxy, this);
}
WebDatabaseManagerProxy::~WebDatabaseManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -40,7 +40,7 @@
: m_isUpdating(false)
, m_context(context)
{
- m_context->addMessageReceiver(CoreIPC::MessageClassWebGeolocationManagerProxy, this);
+ m_context->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebGeolocationManagerProxy, this);
}
WebGeolocationManagerProxy::~WebGeolocationManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -54,7 +54,7 @@
, m_urlImportCompleted(false)
, m_databaseCleanupDisabled(false)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebIconDatabase, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebIconDatabase, this);
}
void WebIconDatabase::invalidate()
Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -41,7 +41,7 @@
WebKeyValueStorageManagerProxy::WebKeyValueStorageManagerProxy(WebContext* context)
: m_webContext(context)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebKeyValueStorageManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebKeyValueStorageManagerProxy, this);
}
WebKeyValueStorageManagerProxy::~WebKeyValueStorageManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -40,7 +40,7 @@
WebMediaCacheManagerProxy::WebMediaCacheManagerProxy(WebContext* context)
: m_webContext(context)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebMediaCacheManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebMediaCacheManagerProxy, this);
}
WebMediaCacheManagerProxy::~WebMediaCacheManagerProxy()
Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (131840 => 131841)
--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -45,7 +45,7 @@
WebResourceCacheManagerProxy::WebResourceCacheManagerProxy(WebContext* webContext)
: m_webContext(webContext)
{
- m_webContext->addMessageReceiver(CoreIPC::MessageClassWebResourceCacheManagerProxy, this);
+ m_webContext->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebResourceCacheManagerProxy, this);
}
WebResourceCacheManagerProxy::~WebResourceCacheManagerProxy()
Modified: trunk/Source/WebKit2/WebProcess/Authentication/AuthenticationManager.cpp (131840 => 131841)
--- trunk/Source/WebKit2/WebProcess/Authentication/AuthenticationManager.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/WebProcess/Authentication/AuthenticationManager.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -55,7 +55,7 @@
AuthenticationManager::AuthenticationManager()
{
- WebProcess::shared().connection()->addMessageReceiver(CoreIPC::MessageClassAuthenticationManager, this);
+ WebProcess::shared().connection()->deprecatedAddMessageReceiver(CoreIPC::MessageClassAuthenticationManager, this);
}
void AuthenticationManager::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
Modified: trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp (131840 => 131841)
--- trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp 2012-10-19 02:19:57 UTC (rev 131840)
+++ trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp 2012-10-19 02:29:23 UTC (rev 131841)
@@ -57,7 +57,7 @@
void WebGeolocationManager::registerWebPage(WebPage* page)
{
if (!m_didAddMessageReceiver) {
- m_process->connection()->addMessageReceiver(CoreIPC::MessageClassWebGeolocationManager, this);
+ m_process->connection()->deprecatedAddMessageReceiver(CoreIPC::MessageClassWebGeolocationManager, this);
m_didAddMessageReceiver = true;
}
