Changeset 85570 in webkit
- Timestamp:
- May 2, 2011 6:19:07 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r85569 r85570 1 2011-05-02 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Oliver Hunt. 4 5 Dispatch the PluginProcessCrashed on the connection work queue 6 https://bugs.webkit.org/show_bug.cgi?id=59996 7 8 * WebProcess/WebProcess.cpp: 9 (WebKit::WebProcess::initialize): 10 Add the web process as a queue client. 11 12 (WebKit::WebProcess::terminate): 13 Remove the web process as a queue client. 14 15 (WebKit::WebProcess::willProcessMessageOnClientRunLoop): 16 Try calling willProcessWebProcessMessageOnClientRunLoop. 17 18 * WebProcess/WebProcess.messages.in: 19 Add the DispatchOnConnectionQueue attribute to PluginProcessCrashed. 20 1 21 2011-05-02 Anders Carlsson <andersca@apple.com> 2 22 -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r85569 r85570 150 150 m_connection->setDidCloseOnConnectionWorkQueueCallback(didCloseOnConnectionWorkQueue); 151 151 m_connection->setShouldExitOnSyncMessageSendFailure(true); 152 m_connection->addQueueClient(this); 152 153 153 154 m_connection->open(); … … 551 552 552 553 // Invalidate our connection. 554 m_connection->removeQueueClient(this); 553 555 m_connection->invalidate(); 554 556 m_connection = nullptr; … … 675 677 } 676 678 679 bool WebProcess::willProcessMessageOnClientRunLoop(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments) 680 { 681 if (messageID.is<CoreIPC::MessageClassWebProcess>()) 682 return willProcessWebProcessMessageOnClientRunLoop(connection, messageID, arguments); 683 684 return true; 685 } 686 677 687 WebFrame* WebProcess::webFrame(uint64_t frameID) const 678 688 { -
trunk/Source/WebKit2/WebProcess/WebProcess.h
r85569 r85570 67 67 struct WebProcessCreationParameters; 68 68 69 class WebProcess : public ChildProcess {69 class WebProcess : public ChildProcess, private CoreIPC::Connection::QueueClient { 70 70 public: 71 71 static WebProcess& shared(); … … 183 183 virtual void syncMessageSendTimedOut(CoreIPC::Connection*); 184 184 185 // CoreIPC::Connection::QueueClient 186 virtual bool willProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); 187 185 188 #if PLATFORM(WIN) 186 189 Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply(); … … 188 191 189 192 // Implemented in generated WebProcessMessageReceiver.cpp 193 bool willProcessWebProcessMessageOnClientRunLoop(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); 190 194 void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); 191 195 192 196 RefPtr<CoreIPC::Connection> m_connection; 193 197 HashMap<uint64_t, RefPtr<WebPage> > m_pageMap; -
trunk/Source/WebKit2/WebProcess/WebProcess.messages.in
r85569 r85570 54 54 55 55 #if ENABLE(PLUGIN_PROCESS) 56 PluginProcessCrashed(String pluginProcess) 56 PluginProcessCrashed(String pluginProcess) DispatchOnConnectionQueue 57 57 #endif 58 58
Note: See TracChangeset
for help on using the changeset viewer.