Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
index 61237be7a..e8f8d2b4a 100644
--- a/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp
@@ -63,19 +63,19 @@ bool WebConnectionToUIProcess::decodeMessageBody(CoreIPC::ArgumentDecoder& decod
     return decoder.decode(messageBodyDecoder);
 }
 
-CoreIPC::Connection* WebConnectionToUIProcess::connection() const
+bool WebConnectionToUIProcess::hasValidConnection() const
 {
-    return m_process->connection();
+    return m_process;
 }
 
-uint64_t WebConnectionToUIProcess::destinationID() const
+CoreIPC::Connection* WebConnectionToUIProcess::messageSenderConnection()
 {
-    return 0;
+    return m_process->parentProcessConnection();
 }
 
-bool WebConnectionToUIProcess::hasValidConnection() const
+uint64_t WebConnectionToUIProcess::messageSenderDestinationID()
 {
-    return m_process;
+    return 0;
 }
 
 } // namespace WebKit