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

Unified Diff: webkit/glue/resource_request_body.cc

Issue 11778016: net: Stop using base::WorkerPool from UploadFileElementReader (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Stop allowing NULL task runner Created 7 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
Index: webkit/glue/resource_request_body.cc
diff --git a/webkit/glue/resource_request_body.cc b/webkit/glue/resource_request_body.cc
index b75666f55afe045e2249124ef1e752dd4730dc1e..ace0772403ac29555f31ff43faa63e5f88cf78f3 100644
--- a/webkit/glue/resource_request_body.cc
+++ b/webkit/glue/resource_request_body.cc
@@ -41,8 +41,10 @@ class BytesElementReader : public net::UploadBytesElementReader {
class FileElementReader : public net::UploadFileElementReader {
public:
FileElementReader(ResourceRequestBody* resource_request_body,
+ base::TaskRunner* task_runner,
const ResourceRequestBody::Element& element)
- : net::UploadFileElementReader(element.path(),
+ : net::UploadFileElementReader(task_runner,
+ element.path(),
element.offset(),
element.length(),
element.expected_modification_time()),
@@ -93,7 +95,8 @@ void ResourceRequestBody::AppendFileSystemFileRange(
net::UploadDataStream*
ResourceRequestBody::ResolveElementsAndCreateUploadDataStream(
- BlobStorageController* blob_controller) {
+ BlobStorageController* blob_controller,
+ base::TaskRunner* task_runner) {
// Resolve all blob elements.
std::vector<const Element*> resolved_elements;
for (size_t i = 0; i < elements_.size(); ++i) {
@@ -114,7 +117,8 @@ ResourceRequestBody::ResolveElementsAndCreateUploadDataStream(
element_readers.push_back(new BytesElementReader(this, element));
break;
case Element::TYPE_FILE:
- element_readers.push_back(new FileElementReader(this, element));
+ element_readers.push_back(
+ new FileElementReader(this, task_runner, element));
break;
case Element::TYPE_FILE_FILESYSTEM:
// TODO(kinuko): Resolve FileSystemURL before creating UploadData.

Powered by Google App Engine
This is Rietveld 408576698