Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
index 6202608bd..a80cfbc30 100644
--- a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
+++ b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp
@@ -54,7 +54,7 @@ WebConnectionToWebProcess::WebConnectionToWebProcess(WebProcessProxy* process, C
 
 void WebConnectionToWebProcess::encodeMessageBody(CoreIPC::ArgumentEncoder& encoder, APIObject* messageBody)
 {
-    encoder.encode(WebContextUserMessageEncoder(messageBody));
+    encoder << WebContextUserMessageEncoder(messageBody);
 }
 
 bool WebConnectionToWebProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decoder, RefPtr<APIObject>& messageBody)
@@ -94,14 +94,14 @@ void WebConnectionToWebProcess::didClose(CoreIPC::Connection* connection)
     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.