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

Unified Diff: net/base/upload_file_element_reader.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « net/base/upload_bytes_element_reader.cc ('k') | net/cert/cert_policy_enforcer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/upload_file_element_reader.cc
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc
index 46824668ccee5fa812517bda2df447d5d97ea3ae..9be9117c2ab53c42d76d1835d3ca37a394ad63a2 100644
--- a/net/base/upload_file_element_reader.cc
+++ b/net/base/upload_file_element_reader.cc
@@ -78,8 +78,8 @@ int UploadFileElementReader::Read(IOBuffer* buf,
const CompletionCallback& callback) {
DCHECK(!callback.is_null());
- uint64 num_bytes_to_read =
- std::min(BytesRemaining(), static_cast<uint64>(buf_length));
+ int num_bytes_to_read = static_cast<int>(
+ std::min(BytesRemaining(), static_cast<uint64>(buf_length)));
if (num_bytes_to_read == 0)
return 0;
@@ -140,7 +140,7 @@ void UploadFileElementReader::OnSeekCompleted(
if (result < 0) {
DLOG(WARNING) << "Failed to seek \"" << path_.value()
<< "\" to offset: " << range_offset_ << " (" << result << ")";
- callback.Run(result);
+ callback.Run(static_cast<int>(result));
return;
}
« no previous file with comments | « net/base/upload_bytes_element_reader.cc ('k') | net/cert/cert_policy_enforcer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698