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

Unified Diff: content/child/web_data_consumer_handle_impl.cc

Issue 2639873002: Handle correctly "ShouldWait" result of mojo::Wait() in WebDataConsumerHandleImpl. (Closed)
Patch Set: add NOTREACHED() Created 3 years, 11 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 50433a3a3b957ce672f4e91e47ce96e48288b51d..fdec9c9881ec3596b464f8a9c800e1608c73fd51 100644
--- a/content/child/web_data_consumer_handle_impl.cc
+++ b/content/child/web_data_consumer_handle_impl.cc
@@ -61,8 +61,19 @@ Result WebDataConsumerHandleImpl::ReaderImpl::read(void* data,
// 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));
+ MojoResult wait_result = mojo::Wait(
+ context_->handle().get(), MOJO_HANDLE_SIGNAL_READABLE, 0, nullptr);
+ switch (wait_result) {
+ case MOJO_RESULT_OK:
+ return Ok;
+ case MOJO_RESULT_FAILED_PRECONDITION:
+ return Done;
+ case MOJO_RESULT_DEADLINE_EXCEEDED:
+ return ShouldWait;
+ default:
+ NOTREACHED();
+ return UnexpectedError;
+ }
}
uint32_t size_to_pass = size;
« 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