Diff
Modified: trunk/Source/WebKit2/ChangeLog (133044 => 133045)
--- trunk/Source/WebKit2/ChangeLog 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-31 17:36:38 UTC (rev 133045)
@@ -1,3 +1,79 @@
+2012-10-30 Anders Carlsson <[email protected]>
+
+ Connection::Client::didReceiveInvalidMessage should take the full message name
+ https://bugs.webkit.org/show_bug.cgi?id=100788
+
+ Reviewed by Sam Weinig.
+
+ Change Connection::Client::didReceiveInvalidMessage to take the message receiver name and message name as parameters
+ and make WebProcessProxy::didReceiveInvalidMessage print out the full message name.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::didReceiveInvalidMessage):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ (NetworkConnectionToWebProcess):
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::didReceiveInvalidMessage):
+ * NetworkProcess/NetworkProcess.h:
+ (NetworkProcess):
+ * Platform/CoreIPC/Connection.cpp:
+ (CoreIPC::Connection::dispatchMessage):
+ * Platform/CoreIPC/Connection.h:
+ (Client):
+ * Platform/CoreIPC/StringReference.cpp:
+ (CoreIPC::StringReference::toString):
+ (CoreIPC):
+ * Platform/CoreIPC/StringReference.h:
+ (StringReference):
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::didReceiveInvalidMessage):
+ * PluginProcess/PluginProcess.h:
+ (PluginProcess):
+ * PluginProcess/WebProcessConnection.cpp:
+ (WebKit::WebProcessConnection::didReceiveInvalidMessage):
+ * PluginProcess/WebProcessConnection.h:
+ (WebProcessConnection):
+ * SharedWorkerProcess/SharedWorkerProcess.cpp:
+ (WebKit::SharedWorkerProcess::didReceiveInvalidMessage):
+ * SharedWorkerProcess/SharedWorkerProcess.h:
+ (SharedWorkerProcess):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::didReceiveInvalidMessage):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ (NetworkProcessProxy):
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::didReceiveInvalidMessage):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ (PluginProcessProxy):
+ * UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp:
+ (WebKit::SharedWorkerProcessProxy::didReceiveInvalidMessage):
+ * UIProcess/SharedWorkers/SharedWorkerProcessProxy.h:
+ (SharedWorkerProcessProxy):
+ * UIProcess/WebConnectionToWebProcess.cpp:
+ (WebKit::WebConnectionToWebProcess::didReceiveInvalidMessage):
+ * UIProcess/WebConnectionToWebProcess.h:
+ (WebConnectionToWebProcess):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didReceiveInvalidMessage):
+ * UIProcess/WebProcessProxy.h:
+ (WebProcessProxy):
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didReceiveInvalidMessage):
+ * WebProcess/Network/NetworkProcessConnection.h:
+ (NetworkProcessConnection):
+ * WebProcess/Plugins/PluginProcessConnection.cpp:
+ (WebKit::PluginProcessConnection::didReceiveInvalidMessage):
+ * WebProcess/Plugins/PluginProcessConnection.h:
+ (PluginProcessConnection):
+ * WebProcess/WebConnectionToUIProcess.cpp:
+ (WebKit::WebConnectionToUIProcess::didReceiveInvalidMessage):
+ * WebProcess/WebConnectionToUIProcess.h:
+ (WebConnectionToUIProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didReceiveInvalidMessage):
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+
2012-10-31 Christophe Dumez <[email protected]>
[EFL][WK2][AC] Use smart pointers for Evas_GL types
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -104,7 +104,7 @@
m_connection = 0;
}
-void NetworkConnectionToWebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void NetworkConnectionToWebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -68,7 +68,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
// Message handlers.
void didReceiveNetworkConnectionToWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -87,7 +87,7 @@
RunLoop::current()->stop();
}
-void NetworkProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void NetworkProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
RunLoop::current()->stop();
}
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -64,7 +64,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
// Message Handlers
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (133044 => 133045)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -692,7 +692,7 @@
m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount--;
if (m_didReceiveInvalidMessage && m_client)
- m_client->didReceiveInvalidMessage(this, message.messageID());
+ m_client->didReceiveInvalidMessage(this, arguments->messageReceiverName(), arguments->messageName());
m_didReceiveInvalidMessage = oldDidReceiveInvalidMessage;
}
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (133044 => 133045)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -88,7 +88,7 @@
class Client : public MessageReceiver {
public:
virtual void didClose(Connection*) = 0;
- virtual void didReceiveInvalidMessage(Connection*, MessageID) = 0;
+ virtual void didReceiveInvalidMessage(Connection*, StringReference messageReceiverName, StringReference messageName) = 0;
#if PLATFORM(WIN)
virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply() = 0;
Modified: trunk/Source/WebKit2/Platform/CoreIPC/StringReference.cpp (133044 => 133045)
--- trunk/Source/WebKit2/Platform/CoreIPC/StringReference.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/Platform/CoreIPC/StringReference.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -30,9 +30,15 @@
#include "ArgumentEncoder.h"
#include "DataReference.h"
#include <wtf/StringHasher.h>
+#include <wtf/text/CString.h>
namespace CoreIPC {
+CString StringReference::toString() const
+{
+ return WTF::CString(m_data, m_size);
+}
+
void StringReference::encode(ArgumentEncoder& encoder) const
{
encoder << DataReference(reinterpret_cast<const uint8_t*>(m_data), m_size);
Modified: trunk/Source/WebKit2/Platform/CoreIPC/StringReference.h (133044 => 133045)
--- trunk/Source/WebKit2/Platform/CoreIPC/StringReference.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/Platform/CoreIPC/StringReference.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -26,6 +26,7 @@
#ifndef StringReference_h
#define StringReference_h
+#include <wtf/Forward.h>
#include <wtf/HashTraits.h>
namespace CoreIPC {
@@ -59,6 +60,8 @@
size_t size() const { return m_size; }
const char* data() const { return m_data; }
+ CString toString() const;
+
friend bool operator==(const StringReference& a, const StringReference& b)
{
return a.m_size == b.m_size && !memcmp(a.m_data, b.m_data, a.m_size);
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -146,7 +146,7 @@
RunLoop::current()->stop();
}
-void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void PluginProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -76,7 +76,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID) OVERRIDE;
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
// Message handlers.
void didReceivePluginProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp (133044 => 133045)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -188,7 +188,7 @@
destroyPluginControllerProxy(pluginControllerProxy);
}
-void WebProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void WebProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
// FIXME: Implement.
}
Modified: trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h (133044 => 133045)
--- trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -65,7 +65,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
// Message handlers.
void didReceiveWebProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -114,7 +114,7 @@
RunLoop::current()->stop();
}
-void SharedWorkerProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void SharedWorkerProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -59,7 +59,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
// Message handlers.
void didReceiveSharedWorkerProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -112,7 +112,7 @@
networkProcessCrashedOrFailedToLaunch();
}
-void NetworkProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void NetworkProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -55,7 +55,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
// Message handlers
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -179,7 +179,7 @@
pluginProcessCrashedOrFailedToLaunch();
}
-void PluginProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void PluginProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -100,7 +100,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*) OVERRIDE;
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID) OVERRIDE;
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
// ProcessLauncher::Client
virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
Modified: trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -128,7 +128,7 @@
sharedWorkerProcessCrashedOrFailedToLaunch();
}
-void SharedWorkerProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void SharedWorkerProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.h (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessProxy.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -64,7 +64,7 @@
// CoreIPC::Connection::Client
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
// ProcessLauncher::Client
virtual void didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier);
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -94,14 +94,14 @@
m_client.didClose(this);
}
-void WebConnectionToWebProcess::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID)
+void WebConnectionToWebProcess::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
{
RefPtr<WebConnectionToWebProcess> protector = this;
RefPtr<WebProcessProxy> process = m_process;
// This will invalidate the CoreIPC::Connection and the WebProcessProxy member
// variables, so we should be careful not to use them after this call.
- process->didReceiveInvalidMessage(connection, messageID);
+ process->didReceiveInvalidMessage(connection, messageReceiverName, messageName);
// Since we've invalidated the connection we'll never get a CoreIPC::Connection::Client::didClose
// callback so we'll explicitly call it here instead.
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -49,7 +49,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
#if PLATFORM(WIN)
virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -477,9 +477,9 @@
pages[i]->processDidCrash();
}
-void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID)
+void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
{
- WTFLogAlways("Received an invalid message from the web process with message ID %x\n", messageID.toInt());
+ WTFLogAlways("Received an invalid message \"%s.%s\" from the web process.\n", messageReceiverName.toString().data(), messageName.toString().data());
// Terminate the WebProcesses.
terminate();
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (133044 => 133045)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -167,7 +167,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
#if PLATFORM(WIN)
virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
#endif
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -62,7 +62,7 @@
WebProcess::shared().networkProcessConnectionClosed(this);
}
-void NetworkProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void NetworkProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -53,7 +53,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
void didReceiveNetworkProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -129,7 +129,7 @@
}
}
-void PluginProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void PluginProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -67,7 +67,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
// Message handlers.
void didReceiveSyncPluginProcessConnectionMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -81,9 +81,9 @@
m_process->didClose(connection);
}
-void WebConnectionToUIProcess::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID)
+void WebConnectionToUIProcess::didReceiveInvalidMessage(CoreIPC::Connection* connection, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName)
{
- m_process->didReceiveInvalidMessage(connection, messageID);
+ m_process->didReceiveInvalidMessage(connection, messageReceiverName, messageName);
}
#if PLATFORM(WIN)
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -48,7 +48,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE;
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&) OVERRIDE;
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID) OVERRIDE;
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
#if PLATFORM(WIN)
virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-10-31 17:36:38 UTC (rev 133045)
@@ -742,7 +742,7 @@
m_runLoop->stop();
}
-void WebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID)
+void WebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
{
// We received an invalid message, but since this is from the UI process (which we trust),
// we'll let it slide.
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (133044 => 133045)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-10-31 17:33:32 UTC (rev 133044)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2012-10-31 17:36:38 UTC (rev 133045)
@@ -288,7 +288,7 @@
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
virtual void didClose(CoreIPC::Connection*);
- virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
+ virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE;
#if PLATFORM(WIN)
virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
#endif
