Changeset 189546 in webkit
- Timestamp:
- Sep 9, 2015 1:39:32 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r189545 r189546 1 2015-09-09 Alexey Proskuryakov <ap@apple.com> 2 3 fast/dom/rtl-scroll-to-leftmost-and-resize.html is a flaky timeout - IPC drops messages 4 https://bugs.webkit.org/show_bug.cgi?id=148951 5 6 Reviewed by Anders Carlsson. 7 8 * platform/mac-wk2/TestExpectations: Unmark the test (it still fails per platform/mac 9 expectations, which is unrelated). 10 1 11 2015-09-09 Youenn Fablet <youenn.fablet@crf.canon.fr> 2 12 -
trunk/LayoutTests/platform/mac-wk2/TestExpectations
r189491 r189546 271 271 webkit.org/b/147075 [ Release Yosemite ] http/tests/cache/disk-cache/disk-cache-disable.html [ Pass Failure ] 272 272 273 webkit.org/b/148951 fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Pass Failure Timeout ]274 275 273 ### END OF (1) Classified failures with bug reports 276 274 ######################################## -
trunk/Source/WebKit2/ChangeLog
r189513 r189546 1 2015-09-09 Alexey Proskuryakov <ap@apple.com> 2 3 fast/dom/rtl-scroll-to-leftmost-and-resize.html is a flaky timeout - IPC drops messages 4 https://bugs.webkit.org/show_bug.cgi?id=148951 5 6 Reviewed by Anders Carlsson. 7 8 * Platform/IPC/Connection.cpp: 9 (IPC::Connection::waitForMessage): Don't modify m_waitingForMessage without holding 10 a lock. This is not part of this fix, but seems necessary for correctness. 11 (IPC::Connection::processIncomingMessage): Don't interrupt a wait that has already succeeded. 12 1 13 2015-09-08 Daniel Bates <dabates@apple.com> 2 14 -
trunk/Source/WebKit2/Platform/IPC/Connection.cpp
r188793 r189546 445 445 bool didTimeout = !m_waitForMessageCondition.waitUntil(lock, absoluteTimeout); 446 446 // We timed out, lost our connection, or a sync message came in with InterruptWaitingIfSyncMessageArrives, so stop waiting. 447 if (didTimeout || m_waitingForMessage->messageWaitingInterrupted) 447 if (didTimeout || m_waitingForMessage->messageWaitingInterrupted) { 448 m_waitingForMessage = nullptr; 448 449 break; 449 } 450 451 m_waitingForMessage = nullptr; 450 } 451 } 452 452 453 453 return nullptr; … … 698 698 std::lock_guard<Lock> lock(m_waitForMessageMutex); 699 699 700 if (m_waitingForMessage && m_waitingForMessage->messageReceiverName == message->messageReceiverName() && m_waitingForMessage->messageName == message->messageName() && m_waitingForMessage->destinationID == message->destinationID()) { 701 m_waitingForMessage->decoder = WTF::move(message); 702 ASSERT(m_waitingForMessage->decoder); 703 m_waitForMessageCondition.notifyOne(); 704 return; 705 } 706 707 if (m_waitingForMessage && (m_waitingForMessage->waitForMessageFlags & InterruptWaitingIfSyncMessageArrives) && message->isSyncMessage()) { 708 m_waitingForMessage->messageWaitingInterrupted = true; 709 m_waitForMessageCondition.notifyOne(); 700 if (m_waitingForMessage && !m_waitingForMessage->decoder) { 701 if (m_waitingForMessage->messageReceiverName == message->messageReceiverName() && m_waitingForMessage->messageName == message->messageName() && m_waitingForMessage->destinationID == message->destinationID()) { 702 m_waitingForMessage->decoder = WTF::move(message); 703 ASSERT(m_waitingForMessage->decoder); 704 m_waitForMessageCondition.notifyOne(); 705 return; 706 } 707 708 if ((m_waitingForMessage->waitForMessageFlags & InterruptWaitingIfSyncMessageArrives) && message->isSyncMessage()) { 709 m_waitingForMessage->messageWaitingInterrupted = true; 710 m_waitForMessageCondition.notifyOne(); 711 } 710 712 } 711 713 }
Note: See TracChangeset
for help on using the changeset viewer.