Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1378)

Unified Diff: content/child/web_data_consumer_handle_impl.cc

Issue 2363963002: Make WebDataConsumerHandleImpl return OK while zero-length reading of closed pipe. (Closed)
Patch Set: use mojo::Wait() with 0 deadline to check whether readable or not Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/web_data_consumer_handle_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/web_data_consumer_handle_impl.cc
diff --git a/content/child/web_data_consumer_handle_impl.cc b/content/child/web_data_consumer_handle_impl.cc
index c111cca36035cb5863d525749d0a6bbf71930bf9..50433a3a3b957ce672f4e91e47ce96e48288b51d 100644
--- a/content/child/web_data_consumer_handle_impl.cc
+++ b/content/child/web_data_consumer_handle_impl.cc
@@ -56,6 +56,15 @@ Result WebDataConsumerHandleImpl::ReaderImpl::read(void* data,
*read_size = 0;
+ if (!size) {
+ // Even if there is unread data available, mojo::ReadDataRaw() returns
+ // FAILED_PRECONDITION when |size| is 0 and the producer handle was closed.
+ // But in this case, WebDataConsumerHandle::Reader::read() must return Ok.
+ // So we use mojo::Wait() with 0 deadline to check whether readable or not.
+ return HandleReadResult(mojo::Wait(
+ context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE, 0, nullptr));
+ }
+
uint32_t size_to_pass = size;
MojoReadDataFlags flags_to_pass = MOJO_READ_DATA_FLAG_NONE;
MojoResult rv = mojo::ReadDataRaw(context_->handle().get(), data,
« no previous file with comments | « no previous file | content/child/web_data_consumer_handle_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698