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, 26 insertions, 14 deletions

diff --git a/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp b/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp
index 4173463f4..0e439d219 100644
--- a/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.cpp
@@ -35,27 +35,27 @@
 
 namespace WebKit {
 
+const char* WebNetworkInfoManagerProxy::supplementName()
+{
+    return "WebNetworkInfoManagerProxy";
+}
+
 PassRefPtr<WebNetworkInfoManagerProxy> WebNetworkInfoManagerProxy::create(WebContext* context)
 {
     return adoptRef(new WebNetworkInfoManagerProxy(context));
 }
 
 WebNetworkInfoManagerProxy::WebNetworkInfoManagerProxy(WebContext* context)
-    : m_isUpdating(false)
-    , m_context(context)
+    : WebContextSupplement(context)
+    , m_isUpdating(false)
 {
-    m_context->addMessageReceiver(Messages::WebNetworkInfoManagerProxy::messageReceiverName(), this);
+    WebContextSupplement::context()->addMessageReceiver(Messages::WebNetworkInfoManagerProxy::messageReceiverName(), this);
 }
 
 WebNetworkInfoManagerProxy::~WebNetworkInfoManagerProxy()
 {
 }
 
-void WebNetworkInfoManagerProxy::invalidate()
-{
-    stopUpdating();
-}
-
 void WebNetworkInfoManagerProxy::initializeProvider(const WKNetworkInfoProvider* provider)
 {
     m_provider.initialize(provider);
@@ -63,20 +63,32 @@ void WebNetworkInfoManagerProxy::initializeProvider(const WKNetworkInfoProvider*
 
 void WebNetworkInfoManagerProxy::providerDidChangeNetworkInformation(const AtomicString& eventType, WebNetworkInfo* networkInformation)
 {
-    if (!m_context)
+    if (!context())
         return;
 
-    m_context->sendToAllProcesses(Messages::WebNetworkInfoManager::DidChangeNetworkInformation(eventType, networkInformation->data()));
+    context()->sendToAllProcesses(Messages::WebNetworkInfoManager::DidChangeNetworkInformation(eventType, networkInformation->data()));
+}
+
+// WebContextSupplement
+
+void WebNetworkInfoManagerProxy::contextDestroyed()
+{
+    stopUpdating();
+}
+
+void WebNetworkInfoManagerProxy::processDidClose(WebProcessProxy*)
+{
+    stopUpdating();
 }
 
-void WebNetworkInfoManagerProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder)
+void WebNetworkInfoManagerProxy::refWebContextSupplement()
 {
-    didReceiveWebNetworkInfoManagerProxyMessage(connection, messageID, decoder);
+    APIObject::ref();
 }
 
-void WebNetworkInfoManagerProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
+void WebNetworkInfoManagerProxy::derefWebContextSupplement()
 {
-    didReceiveSyncWebNetworkInfoManagerProxyMessage(connection, messageID, decoder, replyEncoder);
+    APIObject::deref();
 }
 
 void WebNetworkInfoManagerProxy::startUpdating()