Changeset 77938 in webkit
- Timestamp:
- Feb 8, 2011 8:01:13 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r77915 r77938 1 2011-02-08 Adam Roben <aroben@apple.com> 2 3 Don't mark a Connection as connected until open() is called on Windows 4 5 This matches Mac. Even though the Connection's pipe is connected before open() is called, 6 the Connection itself isn't really connected to the pipe until then, and we won't actually 7 read any data from before that point. 8 9 Fixes <http://webkit.org/b/53998> <rdar://problem/8971207> REGRESSION (r77874): Assertion 10 failure on launch in Connection::setDidCloseOnConnectionWorkQueueCallback on Windows 11 12 Reviewed by Darin Adler. 13 14 * Platform/CoreIPC/win/ConnectionWin.cpp: 15 (CoreIPC::Connection::platformInitialize): Moved code to set m_isConnected from here to 16 open. 17 (CoreIPC::Connection::platformInvalidate): Unset m_isConnected, to match Mac. (This isn't 18 part of the bug fix, but seemed worthwhile.) 19 (CoreIPC::Connection::open): Set m_isConnected now that we're going to listen on the pipe. 20 1 21 2011-02-08 Sheriff Bot <webkit.review.bot@gmail.com> 2 22 -
trunk/Source/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
r76916 r77938 90 90 91 91 m_connectionPipe = identifier; 92 93 // We connected the two ends of the pipe in createServerAndClientIdentifiers.94 m_isConnected = true;95 92 } 96 93 … … 99 96 if (m_connectionPipe == INVALID_HANDLE_VALUE) 100 97 return; 98 99 m_isConnected = false; 101 100 102 101 m_connectionQueue.unregisterAndCloseHandle(m_readState.hEvent); … … 257 256 bool Connection::open() 258 257 { 258 // We connected the two ends of the pipe in createServerAndClientIdentifiers. 259 m_isConnected = true; 260 259 261 // Start listening for read and write state events. 260 262 m_connectionQueue.registerHandle(m_readState.hEvent, WorkItem::create(this, &Connection::readEventHandler));
Note: See TracChangeset
for help on using the changeset viewer.