diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-12-26 00:24:34 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:19 +0000 |
| commit | b9e202b0f12f275d4aade98943df92bf67684f52 (patch) | |
| tree | 4471f3da5f573679c3f42b0ad54c46bdd0a50910 /Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp | |
| parent | 1c8f056531c65706b85c44c2db657ea891be868d (diff) | |
| download | qtwebkit-b9e202b0f12f275d4aade98943df92bf67684f52.tar.gz | |
Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9a
Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp')
| -rw-r--r-- | Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp b/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp index 71f2e252f..18d02cdd9 100644 --- a/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp +++ b/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp @@ -423,7 +423,10 @@ bool Connection::open() return G_SOURCE_REMOVE; }); #elif PLATFORM(QT) - m_socketNotifier = m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, WTF::bind(&Connection::readyReadHandler, this)); + m_socketNotifier = m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, + [protectedThis] { + protectedThis->readyReadHandler(); + }); #elif PLATFORM(EFL) m_connectionQueue->registerSocketEventHandler(m_socketDescriptor, [protectedThis] { @@ -603,7 +606,11 @@ void Connection::didReceiveSyncReply(unsigned flags) #if PLATFORM(QT) void Connection::setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier process) { - m_connectionQueue->dispatchOnTermination(process, WTF::bind(&Connection::connectionDidClose, this)); + RefPtr<Connection> protectedThis(this); + m_connectionQueue->dispatchOnTermination(process, + [protectedThis] { + protectedThis->connectionDidClose(); + }); } #endif |