Diff
Modified: trunk/Source/WebKit2/ChangeLog (141173 => 141174)
--- trunk/Source/WebKit2/ChangeLog 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-30 00:00:39 UTC (rev 141174)
@@ -1,3 +1,48 @@
+2013-01-29 Anders Carlsson <[email protected]>
+
+ Get rid of MessageID::is()
+ https://bugs.webkit.org/show_bug.cgi?id=108234
+
+ Reviewed by Beth Dakin.
+
+ Add explicit message receiver name equality checks instead of using MessageID::is.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
+ (WebKit::NetworkConnectionToWebProcess::didReceiveSyncMessage):
+ * Platform/CoreIPC/MessageID.h:
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::didReceiveMessage):
+ (WebKit::WebProcessConnection::didReceiveSyncMessage):
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::SecItemShim::didReceiveMessageOnConnectionWorkQueue):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::didReceiveMessage):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::didReceiveMessage):
+ (WebKit::WebContext::didReceiveSyncMessage):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveMessage):
+ (WebKit::WebPageProxy::didReceiveSyncMessage):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didReceiveMessage):
+ (WebKit::WebProcessProxy::didReceiveSyncMessage):
+ (WebKit::WebProcessProxy::didReceiveMessageOnConnectionWorkQueue):
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue):
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didReceiveMessage):
+ (WebKit::NetworkProcessConnection::didReceiveSyncMessage):
+ * WebProcess/Plugins/PluginProcessConnection.cpp:
+ (WebKit::PluginProcessConnection::didReceiveSyncMessage):
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::didReceiveMessageOnConnectionWorkQueue):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didReceiveMessage):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didReceiveMessage):
+ (WebKit::WebProcess::didReceiveMessageOnConnectionWorkQueue):
+
2012-11-28 Jer Noble <[email protected]>
Allow clients to ask for the WebView/WKView placeholder view when in full screen mode.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (141173 => 141174)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -27,6 +27,7 @@
#include "NetworkConnectionToWebProcess.h"
#include "ConnectionStack.h"
+#include "NetworkConnectionToWebProcessMessages.h"
#include "NetworkProcess.h"
#include "NetworkResourceLoader.h"
#include "RemoteNetworkingContext.h"
@@ -61,7 +62,7 @@
void NetworkConnectionToWebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
{
- if (messageID.is<CoreIPC::MessageClassNetworkConnectionToWebProcess>()) {
+ if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
didReceiveNetworkConnectionToWebProcessMessage(connection, messageID, decoder);
return;
}
@@ -71,7 +72,7 @@
void NetworkConnectionToWebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& reply)
{
- if (messageID.is<CoreIPC::MessageClassNetworkConnectionToWebProcess>()) {
+ if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
didReceiveSyncNetworkConnectionToWebProcessMessage(connection, messageID, decoder, reply);
return;
}
Modified: trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h (141173 => 141174)
--- trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h 2013-01-30 00:00:39 UTC (rev 141174)
@@ -172,12 +172,6 @@
{
}
- template <MessageClass K>
- bool is() const
- {
- return getClass() == K;
- }
-
static MessageID fromInt(unsigned i)
{
MessageID messageID;
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (141173 => 141174)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -30,12 +30,14 @@
#include "ArgumentCoders.h"
#include "ConnectionStack.h"
+#include "NPObjectMessageReceiverMessages.h"
#include "NPRemoteObjectMap.h"
#include "PluginControllerProxy.h"
#include "PluginCreationParameters.h"
#include "PluginProcess.h"
#include "PluginProcessConnectionMessages.h"
#include "PluginProxyMessages.h"
+#include "WebProcessConnectionMessages.h"
#include <WebCore/RunLoop.h>
#include <unistd.h>
@@ -118,7 +120,7 @@
{
ConnectionStack::CurrentConnectionPusher currentConnection(ConnectionStack::shared(), connection);
- if (messageID.is<CoreIPC::MessageClassWebProcessConnection>()) {
+ if (decoder.messageReceiverName() == Messages::WebProcessConnection::messageReceiverName()) {
didReceiveWebProcessConnectionMessage(connection, messageID, decoder);
return;
}
@@ -147,7 +149,7 @@
return;
}
- if (messageID.is<CoreIPC::MessageClassNPObjectMessageReceiver>()) {
+ if (decoder.messageReceiverName() == Messages::NPObjectMessageReceiver::messageReceiverName()) {
m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
return;
}
Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (141173 => 141174)
--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -33,6 +33,7 @@
#include "SecItemRequestData.h"
#include "SecItemResponseData.h"
#include "SecItemShimLibrary.h"
+#include "SecItemShimMessages.h"
#include "SecItemShimProxyMessages.h"
#include <Security/Security.h>
#include <dlfcn.h>
@@ -133,7 +134,7 @@
void SecItemShim::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassSecItemShim>()) {
+ if (decoder.messageReceiverName() == Messages::SecItemShim::messageReceiverName()) {
didReceiveSecItemShimMessageOnConnectionWorkQueue(connection, messageID, decoder, didHandleMessage);
return;
}
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (141173 => 141174)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -29,6 +29,7 @@
#if ENABLE(NETWORK_PROCESS)
#include "AuthenticationChallengeProxy.h"
+#include "CustomProtocolManagerProxyMessages.h"
#include "DownloadProxyMessages.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkProcessMessages.h"
@@ -117,7 +118,7 @@
return;
#if ENABLE(CUSTOM_PROTOCOLS)
- if (messageID.is<CoreIPC::MessageClassCustomProtocolManagerProxy>()) {
+ if (decoder.messageReceiverName() == Messages::CustomProtocolManagerProxy::messageReceiverName()) {
m_customProtocolManagerProxy.didReceiveMessage(connection, messageID, decoder);
return;
}
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (141173 => 141174)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -893,7 +893,7 @@
void WebContext::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
{
- if (messageID.is<CoreIPC::MessageClassWebContext>()) {
+ if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {
didReceiveWebContextMessage(connection, messageID, decoder);
return;
}
@@ -917,7 +917,7 @@
void WebContext::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
{
- if (messageID.is<CoreIPC::MessageClassWebContext>()) {
+ if (decoder.messageReceiverName() == Messages::WebContext::messageReceiverName()) {
didReceiveSyncWebContextMessage(connection, messageID, decoder, replyEncoder);
return;
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (141173 => 141174)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -32,6 +32,7 @@
#include "DataReference.h"
#include "DownloadProxy.h"
#include "DrawingAreaProxy.h"
+#include "DrawingAreaProxyMessages.h"
#include "EventDispatcherMessages.h"
#include "FindIndicator.h"
#include "ImmutableArray.h"
@@ -63,7 +64,9 @@
#include "WebFormSubmissionListenerProxy.h"
#include "WebFramePolicyListenerProxy.h"
#include "WebFullScreenManagerProxy.h"
+#include "WebFullScreenManagerProxyMessages.h"
#include "WebInspectorProxy.h"
+#include "WebInspectorProxyMessages.h"
#include "WebNotificationManagerProxy.h"
#include "WebOpenPanelResultListenerProxy.h"
#include "WebPageCreationParameters.h"
@@ -1924,7 +1927,7 @@
void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
{
- if (messageID.is<CoreIPC::MessageClassDrawingAreaProxy>()) {
+ if (decoder.messageReceiverName() == Messages::DrawingAreaProxy::messageReceiverName()) {
m_drawingArea->didReceiveDrawingAreaProxyMessage(connection, messageID, decoder);
return;
}
@@ -1937,7 +1940,7 @@
#endif
#if ENABLE(INSPECTOR)
- if (messageID.is<CoreIPC::MessageClassWebInspectorProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebInspectorProxy::messageReceiverName()) {
if (WebInspectorProxy* inspector = this->inspector())
inspector->didReceiveWebInspectorProxyMessage(connection, messageID, decoder);
return;
@@ -1945,7 +1948,7 @@
#endif
#if ENABLE(FULLSCREEN_API)
- if (messageID.is<CoreIPC::MessageClassWebFullScreenManagerProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebFullScreenManagerProxy::messageReceiverName()) {
fullScreenManager()->didReceiveMessage(connection, messageID, decoder);
return;
}
@@ -1957,7 +1960,7 @@
void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
{
#if ENABLE(INSPECTOR)
- if (messageID.is<CoreIPC::MessageClassWebInspectorProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebInspectorProxy::messageReceiverName()) {
if (WebInspectorProxy* inspector = this->inspector())
inspector->didReceiveSyncWebInspectorProxyMessage(connection, messageID, decoder, replyEncoder);
return;
@@ -1965,7 +1968,7 @@
#endif
#if ENABLE(FULLSCREEN_API)
- if (messageID.is<CoreIPC::MessageClassWebFullScreenManagerProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebFullScreenManagerProxy::messageReceiverName()) {
fullScreenManager()->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
return;
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (141173 => 141174)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebProcessProxy.h"
+#include "CustomProtocolManagerProxyMessages.h"
#include "DataReference.h"
#include "DownloadProxyMap.h"
#include "PluginInfoStore.h"
@@ -419,13 +420,13 @@
if (m_context->dispatchMessage(connection, messageID, decoder))
return;
- if (messageID.is<CoreIPC::MessageClassWebProcessProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebProcessProxy::messageReceiverName()) {
didReceiveWebProcessProxyMessage(connection, messageID, decoder);
return;
}
#if ENABLE(CUSTOM_PROTOCOLS)
- if (messageID.is<CoreIPC::MessageClassCustomProtocolManagerProxy>()) {
+ if (decoder.messageReceiverName() == Messages::CustomProtocolManagerProxy::messageReceiverName()) {
#if ENABLE(NETWORK_PROCESS)
ASSERT(!context()->usesNetworkProcess());
#endif
@@ -453,7 +454,7 @@
if (m_context->dispatchSyncMessage(connection, messageID, decoder, replyEncoder))
return;
- if (messageID.is<CoreIPC::MessageClassWebProcessProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebProcessProxy::messageReceiverName()) {
didReceiveSyncWebProcessProxyMessage(connection, messageID, decoder, replyEncoder);
return;
}
@@ -471,7 +472,7 @@
void WebProcessProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassWebProcessProxy>())
+ if (decoder.messageReceiverName() == Messages::WebProcessProxy::messageReceiverName())
didReceiveWebProcessProxyMessageOnConnectionWorkQueue(connection, messageID, decoder, didHandleMessage);
}
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (141173 => 141174)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -31,6 +31,7 @@
#include "SecItemRequestData.h"
#include "SecItemResponseData.h"
#include "SecItemShimMessages.h"
+#include "SecItemShimProxyMessages.h"
#include <Security/SecItem.h>
namespace WebKit {
@@ -107,7 +108,7 @@
void SecItemShimProxy::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassSecItemShimProxy>()) {
+ if (decoder.messageReceiverName() == Messages::SecItemShimProxy::messageReceiverName()) {
didReceiveSecItemShimProxyMessageOnConnectionWorkQueue(connection, messageID, decoder, didHandleMessage);
return;
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (141173 => 141174)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -32,6 +32,7 @@
#include "WebProcess.h"
#include "WebResourceBuffer.h"
#include "WebResourceLoadScheduler.h"
+#include "WebResourceLoaderMessages.h"
#include <WebCore/ResourceBuffer.h>
#if ENABLE(NETWORK_PROCESS)
@@ -52,7 +53,7 @@
void NetworkProcessConnection::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
{
- if (messageID.is<CoreIPC::MessageClassWebResourceLoader>()) {
+ if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
if (WebResourceLoader* webResourceLoader = WebProcess::shared().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
webResourceLoader->didReceiveWebResourceLoaderMessage(connection, messageID, decoder);
@@ -64,7 +65,7 @@
void NetworkProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
{
- if (messageID.is<CoreIPC::MessageClassWebResourceLoader>()) {
+ if (decoder.messageReceiverName() == Messages::WebResourceLoader::messageReceiverName()) {
if (WebResourceLoader* webResourceLoader = WebProcess::shared().webResourceLoadScheduler().webResourceLoaderForIdentifier(decoder.destinationID()))
webResourceLoader->didReceiveSyncWebResourceLoaderMessage(connection, messageID, decoder, replyEncoder);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (141173 => 141174)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -28,7 +28,7 @@
#if ENABLE(PLUGIN_PROCESS)
-#include <runtime/JSObject.h>
+#include "NPObjectMessageReceiverMessages.h"
#include "NPRemoteObjectMap.h"
#include "NPRuntimeObjectMap.h"
#include "PluginProcessConnectionManager.h"
@@ -36,6 +36,7 @@
#include "WebProcess.h"
#include "WebProcessProxyMessages.h"
#include <WebCore/FileSystem.h>
+#include <runtime/JSObject.h>
using namespace WebCore;
@@ -101,7 +102,7 @@
void PluginProcessConnection::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
{
- if (messageID.is<CoreIPC::MessageClassNPObjectMessageReceiver>()) {
+ if (decoder.messageReceiverName() == Messages::NPObjectMessageReceiver::messageReceiverName()) {
m_npRemoteObjectMap->didReceiveSyncMessage(connection, messageID, decoder, replyEncoder);
return;
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (141173 => 141174)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -26,6 +26,7 @@
#include "config.h"
#include "EventDispatcher.h"
+#include "EventDispatcherMessages.h"
#include "WebEvent.h"
#include "WebEventConversion.h"
#include "WebPage.h"
@@ -74,7 +75,7 @@
void EventDispatcher::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassEventDispatcher>()) {
+ if (decoder.messageReceiverName() == Messages::EventDispatcher::messageReceiverName()) {
didReceiveEventDispatcherMessageOnConnectionWorkQueue(connection, messageID, decoder, didHandleMessage);
return;
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (141173 => 141174)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -2985,7 +2985,7 @@
void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
{
- if (messageID.is<CoreIPC::MessageClassDrawingArea>()) {
+ if (decoder.messageReceiverName() == Messages::DrawingArea::messageReceiverName()) {
if (m_drawingArea)
m_drawingArea->didReceiveDrawingAreaMessage(connection, messageID, decoder);
return;
@@ -3000,7 +3000,7 @@
#endif
#if ENABLE(INSPECTOR)
- if (messageID.is<CoreIPC::MessageClassWebInspector>()) {
+ if (decoder.messageReceiverName() == Messages::WebInspector::messageReceiverName()) {
if (WebInspector* inspector = this->inspector())
inspector->didReceiveWebInspectorMessage(connection, messageID, decoder);
return;
@@ -3008,7 +3008,7 @@
#endif
#if ENABLE(FULLSCREEN_API)
- if (messageID.is<CoreIPC::MessageClassWebFullScreenManager>()) {
+ if (decoder.messageReceiverName() == Messages::WebFullScreenManager::messageReceiverName()) {
fullScreenManager()->didReceiveMessage(connection, messageID, decoder);
return;
}
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (141173 => 141174)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-29 23:54:46 UTC (rev 141173)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-30 00:00:39 UTC (rev 141174)
@@ -45,6 +45,7 @@
#include "WebMemorySampler.h"
#include "WebPage.h"
#include "WebPageCreationParameters.h"
+#include "WebPageGroupProxyMessages.h"
#include "WebPlatformStrategies.h"
#include "WebPreferencesStore.h"
#include "WebProcessCreationParameters.h"
@@ -593,12 +594,12 @@
if (messageReceiverMap().dispatchMessage(connection, messageID, decoder))
return;
- if (messageID.is<CoreIPC::MessageClassWebProcess>()) {
+ if (decoder.messageReceiverName() == Messages::WebProcess::messageReceiverName()) {
didReceiveWebProcessMessage(connection, messageID, decoder);
return;
}
- if (messageID.is<CoreIPC::MessageClassWebPageGroupProxy>()) {
+ if (decoder.messageReceiverName() == Messages::WebPageGroupProxy::messageReceiverName()) {
uint64_t pageGroupID = decoder.destinationID();
if (!pageGroupID)
return;
@@ -639,7 +640,7 @@
void WebProcess::didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, bool& didHandleMessage)
{
- if (messageID.is<CoreIPC::MessageClassWebProcess>()) {
+ if (decoder.messageReceiverName() == Messages::WebProcess::messageReceiverName()) {
didReceiveWebProcessMessageOnConnectionWorkQueue(connection, messageID, decoder, didHandleMessage);
return;
}
