Changeset 117777 in webkit
- Timestamp:
- May 21, 2012 6:49:48 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r117735 r117777 1 2012-05-21 Allan Sandfeld Jensen <allan.jensen@nokia.com> 2 3 Disambiguate WTF::bind and std::bind from C++11 4 https://bugs.webkit.org/show_bug.cgi?id=86465 5 6 Reviewed by Darin Adler. 7 8 * Platform/CoreIPC/Connection.cpp: 9 (CoreIPC::Connection::SyncMessageState::processIncomingMessage): 10 (CoreIPC::Connection::addQueueClient): 11 (CoreIPC::Connection::removeQueueClient): 12 (CoreIPC::Connection::invalidate): 13 (CoreIPC::Connection::sendMessage): 14 (CoreIPC::Connection::postConnectionDidCloseOnConnectionWorkQueue): 15 (CoreIPC::Connection::connectionDidClose): 16 (CoreIPC::Connection::enqueueIncomingMessage): 17 * Platform/CoreIPC/unix/ConnectionUnix.cpp: 18 (CoreIPC::Connection::open): 19 (CoreIPC::Connection::setShouldCloseConnectionOnProcessTermination): 20 * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: 21 (WebKit::NetscapePlugin::pluginThreadAsyncCall): 22 * WebProcess/WebPage/FindController.cpp: 23 (WebKit::FindController::findString): 24 1 25 2012-05-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 26 -
trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp
r116226 r117777 32 32 #include <wtf/CurrentTime.h> 33 33 34 using namespace std;35 34 using namespace WebCore; 36 35 … … 142 141 143 142 if (!m_didScheduleDispatchMessagesWork) { 144 m_runLoop->dispatch( bind(&SyncMessageState::dispatchMessageAndResetDidScheduleDispatchMessagesWork, this));143 m_runLoop->dispatch(WTF::bind(&SyncMessageState::dispatchMessageAndResetDidScheduleDispatchMessagesWork, this)); 145 144 m_didScheduleDispatchMessagesWork = true; 146 145 } … … 237 236 void Connection::addQueueClient(QueueClient* queueClient) 238 237 { 239 m_connectionQueue.dispatch( bind(&Connection::addQueueClientOnWorkQueue, this, queueClient));238 m_connectionQueue.dispatch(WTF::bind(&Connection::addQueueClientOnWorkQueue, this, queueClient)); 240 239 } 241 240 242 241 void Connection::removeQueueClient(QueueClient* queueClient) 243 242 { 244 m_connectionQueue.dispatch( bind(&Connection::removeQueueClientOnWorkQueue, this, queueClient));243 m_connectionQueue.dispatch(WTF::bind(&Connection::removeQueueClientOnWorkQueue, this, queueClient)); 245 244 } 246 245 … … 275 274 m_client = 0; 276 275 277 m_connectionQueue.dispatch( bind(&Connection::platformInvalidate, this));276 m_connectionQueue.dispatch(WTF::bind(&Connection::platformInvalidate, this)); 278 277 } 279 278 … … 318 317 319 318 // FIXME: We should add a boolean flag so we don't call this when work has already been scheduled. 320 m_connectionQueue.dispatch( bind(&Connection::sendOutgoingMessages, this));319 m_connectionQueue.dispatch(WTF::bind(&Connection::sendOutgoingMessages, this)); 321 320 return true; 322 321 } … … 566 565 void Connection::postConnectionDidCloseOnConnectionWorkQueue() 567 566 { 568 m_connectionQueue.dispatch( bind(&Connection::connectionDidClose, this));567 m_connectionQueue.dispatch(WTF::bind(&Connection::connectionDidClose, this)); 569 568 } 570 569 … … 587 586 m_didCloseOnConnectionWorkQueueCallback(m_connectionQueue, this); 588 587 589 m_clientRunLoop->dispatch( bind(&Connection::dispatchConnectionDidClose, this));588 m_clientRunLoop->dispatch(WTF::bind(&Connection::dispatchConnectionDidClose, this)); 590 589 } 591 590 … … 667 666 m_incomingMessages.append(incomingMessage); 668 667 669 m_clientRunLoop->dispatch( bind(&Connection::dispatchOneMessage, this));668 m_clientRunLoop->dispatch(WTF::bind(&Connection::dispatchOneMessage, this)); 670 669 } 671 670 -
trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp
r112353 r117777 46 46 #endif 47 47 48 using namespace std;49 50 48 namespace CoreIPC { 51 49 … … 424 422 m_isConnected = true; 425 423 #if PLATFORM(QT) 426 m_socketNotifier = m_connectionQueue.registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, bind(&Connection::readyReadHandler, this));424 m_socketNotifier = m_connectionQueue.registerSocketEventHandler(m_socketDescriptor, QSocketNotifier::Read, WTF::bind(&Connection::readyReadHandler, this)); 427 425 #elif PLATFORM(GTK) 428 m_connectionQueue.registerEventSourceHandler(m_socketDescriptor, (G_IO_HUP | G_IO_ERR), bind(&Connection::connectionDidClose, this));429 m_connectionQueue.registerEventSourceHandler(m_socketDescriptor, G_IO_IN, bind(&Connection::readyReadHandler, this));426 m_connectionQueue.registerEventSourceHandler(m_socketDescriptor, (G_IO_HUP | G_IO_ERR), WTF::bind(&Connection::connectionDidClose, this)); 427 m_connectionQueue.registerEventSourceHandler(m_socketDescriptor, G_IO_IN, WTF::bind(&Connection::readyReadHandler, this)); 430 428 #elif PLATFORM(EFL) 431 m_connectionQueue.registerSocketEventHandler(m_socketDescriptor, bind(&Connection::readyReadHandler, this));429 m_connectionQueue.registerSocketEventHandler(m_socketDescriptor, WTF::bind(&Connection::readyReadHandler, this)); 432 430 #endif 433 431 434 432 // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal 435 433 // handler. 436 m_connectionQueue.dispatch( bind(&Connection::readyReadHandler, this));434 m_connectionQueue.dispatch(WTF::bind(&Connection::readyReadHandler, this)); 437 435 438 436 return true; … … 562 560 void Connection::setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier process) 563 561 { 564 m_connectionQueue.dispatchOnTermination(process, bind(&Connection::connectionDidClose, this));562 m_connectionQueue.dispatchOnTermination(process, WTF::bind(&Connection::connectionDidClose, this)); 565 563 } 566 564 #endif -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
r117212 r117777 311 311 void NetscapePlugin::pluginThreadAsyncCall(void (*function)(void*), void* userData) 312 312 { 313 RunLoop::main()->dispatch( bind(&NetscapePlugin::handlePluginThreadAsyncCall, this, function, userData));313 RunLoop::main()->dispatch(WTF::bind(&NetscapePlugin::handlePluginThreadAsyncCall, this, function, userData)); 314 314 } 315 315 -
trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp
r115681 r117777 157 157 bool found = m_webPage->corePage()->findString(string, core(options)); 158 158 159 m_webPage->drawingArea()->dispatchAfterEnsuringUpdatedScrollPosition( bind(&FindController::updateFindUIAfterPageScroll, this, found, string, options, maxMatchCount));159 m_webPage->drawingArea()->dispatchAfterEnsuringUpdatedScrollPosition(WTF::bind(&FindController::updateFindUIAfterPageScroll, this, found, string, options, maxMatchCount)); 160 160 } 161 161
Note: See TracChangeset
for help on using the changeset viewer.