[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 11:22:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b8210be26a4b34367a8e5a37914e240902ae80a9
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 20 21:55:31 2010 +0000
Teach Connection how to handle a slow receiver
Fixes <http://webkit.org/b/42667> Assertion in
Connection::sendOutgoingMessage when browser or web process is paused
Reviewed by Anders Carlsson.
* Platform/CoreIPC/win/ConnectionWin.cpp:
(CoreIPC::Connection::sendOutgoingMessage): If WriteFile returns FALSE
and the last error is ERROR_IO_PENDING, Windows will write the data as
soon as the current write operation is completed. We don't need to do
anything special in this case, so there's no need to assert about it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63776 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 98ce1a2..b22ae3f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20 Adam Roben <aroben at apple.com>
+
+ Teach Connection how to handle a slow receiver
+
+ Fixes <http://webkit.org/b/42667> Assertion in
+ Connection::sendOutgoingMessage when browser or web process is paused
+
+ Reviewed by Anders Carlsson.
+
+ * Platform/CoreIPC/win/ConnectionWin.cpp:
+ (CoreIPC::Connection::sendOutgoingMessage): If WriteFile returns FALSE
+ and the last error is ERROR_IO_PENDING, Windows will write the data as
+ soon as the current write operation is completed. We don't need to do
+ anything special in this case, so there's no need to assert about it.
+
2010-07-20 Anders Carlsson <andersca at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp b/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
index d13b580..7296a50 100644
--- a/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
+++ b/WebKit2/Platform/CoreIPC/win/ConnectionWin.cpp
@@ -215,6 +215,11 @@ void Connection::sendOutgoingMessage(MessageID messageID, PassOwnPtr<ArgumentEnc
}
DWORD error = ::GetLastError();
+ if (error == ERROR_IO_PENDING) {
+ // The message will be sent soon.
+ return;
+ }
+
ASSERT_NOT_REACHED();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list