Changeset 236487 in webkit

Timestamp:

Sep 25, 2018, 4:29:34 PM (8 years ago)

Author:

Chris Dumez

Message:

Unreviewed, rolling out r236420 and r236458.

This change is not fully correct

Reverted changesets:

"Do not do early processing of incoming sync IPC unless we're
waiting for a sync IPC reply"
​https://bugs.webkit.org/show_bug.cgi?id=186941
​https://trac.webkit.org/changeset/236420

"Unreviewed, update bug number of http/tests/misc/blob-
size.html crash on Windows"
​https://trac.webkit.org/changeset/236458

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/blob-size-expected.txt (deleted)
• LayoutTests/http/tests/misc/blob-size.html (deleted)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Platform/IPC/Connection.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-25  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r236420 and r236458.
+
+        This change is not fully correct
+
+        Reverted changesets:
+
+        "Do not do early processing of incoming sync IPC unless we're
+        waiting for a sync IPC reply"
+        https://bugs.webkit.org/show_bug.cgi?id=186941
+        https://trac.webkit.org/changeset/236420
+
+        "Unreviewed, update bug number of http/tests/misc/blob-
+        size.html crash on Windows"
+        https://trac.webkit.org/changeset/236458
+
 2018-09-25  Justin Fan  <justin_fan@apple.com>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -4174 +4174 @@
 webkit.org/b/188948 fast/events/dblclick-event-getModifierState.html [ Failure ]
 
-webkit.org/b/189948 http/tests/misc/blob-size.html [ Crash ]
-
 # Tests failing on EWS after updating to iTunes 12.8
 webkit.org/b/189194 http/tests/IndexedDB/collect-IDB-objects.https.html [ Failure ]

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-25  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, rolling out r236420 and r236458.
+
+        This change is not fully correct
+
+        Reverted changesets:
+
+        "Do not do early processing of incoming sync IPC unless we're
+        waiting for a sync IPC reply"
+        https://bugs.webkit.org/show_bug.cgi?id=186941
+        https://trac.webkit.org/changeset/236420
+
+        "Unreviewed, update bug number of http/tests/misc/blob-
+        size.html crash on Windows"
+        https://trac.webkit.org/changeset/236458
+
 2018-09-25  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/Platform/IPC/Connection.cpp

@@ -720 +720 @@
     // a sync reply. If it is, and we're waiting for a sync reply this message needs to be dispatched.
     // If we don't we'll end up with a deadlock where both sync message senders are stuck waiting for a reply.
-    {
-        LockHolder locker(m_syncReplyStateMutex);
-        // If the m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage flag is set, then our sync messages will not be processed by the destination process while it is waiting for a sync IPC reply.
-        // As a result, we need to process incoming sync messages early here, even if we're not waiting for a sync IPC reply in order to prevent deadlocks.
-        if ((m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage || !m_pendingSyncReplies.isEmpty()) && SyncMessageState::singleton().processIncomingMessage(*this, message))
-            return;
-    }
+    if (SyncMessageState::singleton().processIncomingMessage(*this, message))
+        return;
 
     // Check if we're waiting for this message.