Diff
Modified: trunk/Source/WebKit2/ChangeLog (141803 => 141804)
--- trunk/Source/WebKit2/ChangeLog 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-04 21:34:39 UTC (rev 141804)
@@ -1,3 +1,43 @@
+2013-02-04 Anders Carlsson <[email protected]>
+
+ Add didCloseOnConnectionWorkQueue to Connection::QueueClient
+ https://bugs.webkit.org/show_bug.cgi?id=108853
+
+ Reviewed by Andreas Kling.
+
+ * Platform/CoreIPC/Connection.cpp:
+ (CoreIPC::Connection::connectionDidClose):
+ * Platform/CoreIPC/Connection.h:
+ (QueueClient):
+ * Shared/mac/SecItemShim.cpp:
+ (WebKit::SecItemShim::didCloseOnConnectionWorkQueue):
+ * Shared/mac/SecItemShim.h:
+ (SecItemShim):
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::didCloseOnConnectionWorkQueue):
+ (WebKit):
+ * UIProcess/Storage/StorageManager.h:
+ (StorageManager):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didCloseOnConnectionWorkQueue):
+ (WebKit):
+ * UIProcess/WebProcessProxy.h:
+ (WebProcessProxy):
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::didCloseOnConnectionWorkQueue):
+ * UIProcess/mac/SecItemShimProxy.h:
+ (SecItemShimProxy):
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::didCloseOnConnectionWorkQueue):
+ (WebKit):
+ * WebProcess/WebPage/EventDispatcher.h:
+ (EventDispatcher):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::didCloseOnConnectionWorkQueue):
+ (WebKit):
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+
2013-02-04 Martin Robinson <[email protected]>
Fix GTK+ 'make dist' in preparation for the 1.11.5 release.
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (141803 => 141804)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -636,6 +636,9 @@
iter->value->semaphore.signal();
}
+ for (size_t i = 0; i < m_connectionQueueClients.size(); ++i)
+ m_connectionQueueClients[i]->didCloseOnConnectionWorkQueue(this);
+
if (m_didCloseOnConnectionWorkQueueCallback)
m_didCloseOnConnectionWorkQueueCallback(this);
Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.h (141803 => 141804)
--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -95,6 +95,7 @@
class QueueClient {
public:
virtual void didReceiveMessageOnConnectionWorkQueue(Connection*, MessageDecoder&, bool& didHandleMessage) = 0;
+ virtual void didCloseOnConnectionWorkQueue(Connection*) = 0;
protected:
virtual ~QueueClient() { }
Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (141803 => 141804)
--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -140,6 +140,10 @@
}
}
+void SecItemShim::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
}
-#endif
+} // namespace WebKit
+
+#endif // USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.h (141803 => 141804)
--- trunk/Source/WebKit2/Shared/mac/SecItemShim.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -45,8 +45,9 @@
private:
SecItemShim();
- // QueueClient
+ // CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
// Implemented in generated SecItemShimMessageReceiver.cpp.
void didReceiveSecItemShimMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -49,6 +49,10 @@
didReceiveStorageManagerMessageOnConnectionWorkQueue(connection, decoder, didHandleMessage);
}
+void StorageManager::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
+}
+
void StorageManager::createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&)
{
UNUSED_PARAM(storageAreaID);
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -41,8 +41,9 @@
private:
StorageManager();
- // CoreIPC::Connection::QueueClient.
+ // CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
void didReceiveStorageManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -461,6 +461,10 @@
didReceiveWebProcessProxyMessageOnConnectionWorkQueue(connection, decoder, didHandleMessage);
}
+void WebProcessProxy::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
+}
+
void WebProcessProxy::didClose(CoreIPC::Connection*)
{
// Protect ourselves, as the call to disconnect() below may otherwise cause us
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -165,6 +165,7 @@
// CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
// ResponsivenessTimer::Client
void didBecomeUnresponsive(ResponsivenessTimer*) OVERRIDE;
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -114,6 +114,10 @@
}
}
+void SecItemShimProxy::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
}
+} // namespace WebKit
+
#endif // USE(SECURITY_FRAMEWORK)
Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h (141803 => 141804)
--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -42,8 +42,9 @@
private:
SecItemShimProxy();
- // QueueClient
+ // CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
// Implemented in generated SecItemShimProxyMessageReceiver.cpp.
void didReceiveSecItemShimProxyMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (141803 => 141804)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -81,6 +81,10 @@
}
}
+void EventDispatcher::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
+}
+
void EventDispatcher::wheelEvent(CoreIPC::Connection*, uint64_t pageID, const WebWheelEvent& wheelEvent, bool canGoBack, bool canGoForward)
{
#if ENABLE(THREADED_SCROLLING)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (141803 => 141804)
--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -61,6 +61,7 @@
private:
// CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
// Implemented in generated EventDispatcherMessageReceiver.cpp
void didReceiveEventDispatcherMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (141803 => 141804)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-02-04 21:34:39 UTC (rev 141804)
@@ -642,6 +642,10 @@
}
}
+void WebProcess::didCloseOnConnectionWorkQueue(CoreIPC::Connection*)
+{
+}
+
WebFrame* WebProcess::webFrame(uint64_t frameID) const
{
return m_frameMap.get(frameID);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (141803 => 141804)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-02-04 21:31:47 UTC (rev 141803)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-02-04 21:34:39 UTC (rev 141804)
@@ -273,6 +273,7 @@
// CoreIPC::Connection::QueueClient
virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE;
+ virtual void didCloseOnConnectionWorkQueue(CoreIPC::Connection*) OVERRIDE;
// Implemented in generated WebProcessMessageReceiver.cpp
void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
