PPB_URLRequestInfo::AppendFileToBody using sync ipc

net/base/upload_data_stream.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/upload_data_stream.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/threading/thread_restrictions.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 bool UploadDataStream::merge_chunks_ = true;
 
 UploadDataStream::~UploadDataStream() {
 }
@@ skipping 82 matching lines @@
         }
         next_element_remaining_ = element.GetContentLength();
         next_element_stream_.reset(element.NewFileStreamForReading());
       }
 
       int rv = 0;
       int count =
           static_cast<int>(std::min(next_element_remaining_,
                                     static_cast<uint64>(size_remaining)));
       if (count > 0) {
+        // Temporarily allow until fix: http://crbug.com/72001.
+        base::ThreadRestrictions::ScopedAllowIO allow_io;

[michaeln, 2011/08/15 18:12:11]

Was this just missing before or does something about this change actually not
conduct blocking IO on the IO thread where it didn't before?

[kinuko, 2011/08/16 04:00:53]

In my testing whenever I try uploading a file with or without this change the
browser (debug build) crashes here, so I assume this was missing before.

[darin (slow to review), 2011/08/16 17:28:36]

Yeah, I'd expect that this is needed.  I'm not sure why we didn't have it
before.

         if (next_element_stream_.get())
           rv = next_element_stream_->Read(buf_->data() + buf_len_, count, NULL);
         if (rv <= 0) {
           // If there's less data to read than we initially observed, then
           // pad with zero.  Otherwise the server will hang waiting for the
           // rest of the data.
           memset(buf_->data() + buf_len_, 0, count);
           rv = count;
         }
         buf_len_ += rv;
@@ skipping 30 matching lines @@
 bool UploadDataStream::IsOnLastChunk() const {
   const std::vector<UploadData::Element>& elements = *data_->elements();
   DCHECK(data_->is_chunked());
   return (eof_ ||
           (!elements.empty() &&
            next_element_ == elements.size() &&
            elements.back().is_last_chunk()));
 }
 
 }  // namespace net