Title: [154073] trunk/Source/WebKit2
Revision
154073
Author
[email protected]
Date
2013-08-14 14:36:41 -0700 (Wed, 14 Aug 2013)

Log Message

[WK2] Sync messages with with non-default timeout sent from secondary threads always time out
https://bugs.webkit.org/show_bug.cgi?id=119767

Fix by Justin Bur.
Reviewed by Darin Adler.

* Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::sendSyncMessageFromSecondaryThread):
The argument to wait() is absolute time, not a delta. This calculation matches one
in Connection::waitForMessage().

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (154072 => 154073)


--- trunk/Source/WebKit2/ChangeLog	2013-08-14 21:36:05 UTC (rev 154072)
+++ trunk/Source/WebKit2/ChangeLog	2013-08-14 21:36:41 UTC (rev 154073)
@@ -1,3 +1,15 @@
+2013-08-14  Alexey Proskuryakov  <[email protected]>
+
+        [WK2] Sync messages with with non-default timeout sent from secondary threads always time out
+        https://bugs.webkit.org/show_bug.cgi?id=119767
+
+        Fix by Justin Bur.
+        Reviewed by Darin Adler.
+
+        * Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::sendSyncMessageFromSecondaryThread):
+        The argument to wait() is absolute time, not a delta. This calculation matches one
+        in Connection::waitForMessage().
+
 2013-08-14  Tim Horton  <[email protected]>
 
         REGRESSION (r153877): Plugin scanning slows creation of WebViews

Modified: trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp (154072 => 154073)


--- trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-08-14 21:36:05 UTC (rev 154072)
+++ trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp	2013-08-14 21:36:41 UTC (rev 154073)
@@ -511,7 +511,7 @@
     if (timeout == NoTimeout)
         timeout = 1e10;
 
-    pendingReply.semaphore.wait(timeout);
+    pendingReply.semaphore.wait(currentTime() + timeout);
 
     // Finally, pop the pending sync reply information.
     {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to