Index: content/browser/service_worker/service_worker_url_request_job.cc |
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc |
index c69bc87efbda43e9e323c6b7e8319970108d142e..57fbd7d1dc2a3b3217a15bf648c58ab823bd2104 100644 |
--- a/content/browser/service_worker/service_worker_url_request_job.cc |
+++ b/content/browser/service_worker/service_worker_url_request_job.cc |
@@ -15,10 +15,13 @@ |
#include <vector> |
#include "base/bind.h" |
+#include "base/files/file.h" |
#include "base/guid.h" |
#include "base/location.h" |
#include "base/single_thread_task_runner.h" |
#include "base/strings/stringprintf.h" |
+#include "base/task_runner.h" |
+#include "base/task_runner_util.h" |
#include "base/threading/thread_task_runner_handle.h" |
#include "base/time/time.h" |
#include "content/browser/resource_context_impl.h" |
@@ -33,6 +36,7 @@ |
#include "content/common/service_worker/service_worker_types.h" |
#include "content/common/service_worker/service_worker_utils.h" |
#include "content/public/browser/blob_handle.h" |
+#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/resource_request_info.h" |
#include "content/public/browser/service_worker_context.h" |
#include "content/public/common/referrer.h" |
@@ -105,73 +109,79 @@ net::NetLog::EventType RequestJobResultToNetEventType( |
return n::TYPE_FAILED; |
} |
+bool PopulateUnknownFileLengths( |
+ std::vector<ResourceRequestBodyImpl::Element>* elements) { |
+ for (ResourceRequestBodyImpl::Element& element : *elements) { |
+ if (element.type() == ResourceRequestBodyImpl::Element::TYPE_FILE && |
+ element.length() == ResourceRequestBodyImpl::Element::kUnknownSize) { |
+ // Try to open our file. |
+ base::File file(element.path(), |
+ base::File::FLAG_OPEN | base::File::FLAG_READ); |
+ if (file.error_details() != base::File::FILE_OK) |
+ return false; |
+ |
+ base::File::Info file_info; |
+ if (!file.GetInfo(&file_info)) |
+ return false; |
+ |
+ element.SetToFilePathRange(element.path(), element.offset(), |
+ file_info.size, |
+ element.expected_modification_time()); |
+ } |
+ } |
+ return true; |
+} |
+ |
} // namespace |
-class ServiceWorkerURLRequestJob::BlobConstructionWaiter { |
+class ServiceWorkerURLRequestJob::BlobFilesWaiter { |
public: |
- explicit BlobConstructionWaiter(ServiceWorkerURLRequestJob* owner) |
+ explicit BlobFilesWaiter(ServiceWorkerURLRequestJob* owner) |
: owner_(owner), weak_factory_(this) { |
- TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "BlobConstructionWaiter", this, |
- "URL", owner_->request()->url().spec()); |
+ TRACE_EVENT_ASYNC_BEGIN1("ServiceWorker", "BlobFilesWaiter", this, "URL", |
+ owner_->request()->url().spec()); |
owner_->request()->net_log().BeginEvent( |
- net::NetLog::TYPE_SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_BLOB); |
+ net::NetLog::TYPE_SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_FILES); |
} |
- ~BlobConstructionWaiter() { |
+ ~BlobFilesWaiter() { |
owner_->request()->net_log().EndEvent( |
- net::NetLog::TYPE_SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_BLOB, |
+ net::NetLog::TYPE_SERVICE_WORKER_WAITING_FOR_REQUEST_BODY_FILES, |
net::NetLog::BoolCallback("success", phase_ == Phase::SUCCESS)); |
- TRACE_EVENT_ASYNC_END1("ServiceWorker", "BlobConstructionWaiter", this, |
- "Success", phase_ == Phase::SUCCESS); |
+ TRACE_EVENT_ASYNC_END1("ServiceWorker", "BlobFilesWaiter", this, "Success", |
+ phase_ == Phase::SUCCESS); |
} |
- void RunOnComplete(const base::Callback<void(bool)>& callback) { |
+ void RunOnComplete(base::TaskRunner* file_runner, |
+ const base::Callback<void(bool)>& callback) { |
DCHECK_EQ(static_cast<int>(Phase::INITIAL), static_cast<int>(phase_)); |
phase_ = Phase::WAITING; |
- num_pending_request_body_blobs_ = 0; |
+ body_ = owner_->body_; |
callback_ = callback; |
- for (const ResourceRequestBodyImpl::Element& element : |
- *(owner_->body_->elements())) { |
- if (element.type() != ResourceRequestBodyImpl::Element::TYPE_BLOB) |
- continue; |
- |
- std::unique_ptr<storage::BlobDataHandle> handle = |
- owner_->blob_storage_context_->GetBlobDataFromUUID( |
- element.blob_uuid()); |
- if (handle->IsBroken()) { |
- Complete(false); |
- return; |
- } |
- if (handle->IsBeingBuilt()) { |
- ++num_pending_request_body_blobs_; |
- handle->RunOnConstructionComplete( |
- base::Bind(&BlobConstructionWaiter::OneRequestBodyBlobCompleted, |
- weak_factory_.GetWeakPtr())); |
+ bool needsFileStats = false; |
falken
2016/07/22 04:22:19
needs_file_stats
dmurph
2016/08/02 00:58:02
Done.
|
+ for (const ResourceRequestBodyImpl::Element& element : *body_->elements()) { |
+ if (element.type() == ResourceRequestBodyImpl::Element::TYPE_FILE && |
+ element.length() == ResourceRequestBodyImpl::Element::kUnknownSize) { |
+ needsFileStats = true; |
} |
} |
- if (num_pending_request_body_blobs_ == 0) |
+ if (!needsFileStats) { |
Complete(true); |
+ return; |
+ } |
+ |
+ PostTaskAndReplyWithResult( |
+ file_runner, FROM_HERE, |
+ base::Bind(&PopulateUnknownFileLengths, body_->elements_mutable()), |
+ base::Bind(&ServiceWorkerURLRequestJob::BlobFilesWaiter::Complete, |
+ weak_factory_.GetWeakPtr())); |
} |
private: |
enum class Phase { INITIAL, WAITING, SUCCESS, FAIL }; |
- void OneRequestBodyBlobCompleted( |
- bool success, |
- storage::IPCBlobCreationCancelCode cancel_code) { |
- DCHECK_GT(num_pending_request_body_blobs_, 0UL); |
- |
- if (success) |
- --num_pending_request_body_blobs_; |
- else |
- num_pending_request_body_blobs_ = 0; |
- |
- if (num_pending_request_body_blobs_ == 0) |
- Complete(success); |
- } |
- |
void Complete(bool success) { |
DCHECK_EQ(static_cast<int>(Phase::WAITING), static_cast<int>(phase_)); |
phase_ = success ? Phase::SUCCESS : Phase::FAIL; |
@@ -184,11 +194,10 @@ class ServiceWorkerURLRequestJob::BlobConstructionWaiter { |
scoped_refptr<ResourceRequestBodyImpl> body_; |
base::Callback<void(bool)> callback_; |
- size_t num_pending_request_body_blobs_ = 0; |
Phase phase_ = Phase::INITIAL; |
- base::WeakPtrFactory<BlobConstructionWaiter> weak_factory_; |
+ base::WeakPtrFactory<BlobFilesWaiter> weak_factory_; |
- DISALLOW_COPY_AND_ASSIGN(BlobConstructionWaiter); |
+ DISALLOW_COPY_AND_ASSIGN(BlobFilesWaiter); |
}; |
bool ServiceWorkerURLRequestJob::Delegate::RequestStillValid( |
@@ -523,8 +532,9 @@ void ServiceWorkerURLRequestJob::StartRequest() { |
case FORWARD_TO_SERVICE_WORKER: |
if (HasRequestBody()) { |
DCHECK(!blob_construction_waiter_); |
- blob_construction_waiter_.reset(new BlobConstructionWaiter(this)); |
+ blob_construction_waiter_.reset(new BlobFilesWaiter(this)); |
blob_construction_waiter_->RunOnComplete( |
+ BrowserThread::GetBlockingPool(), |
base::Bind(&ServiceWorkerURLRequestJob::RequestBodyBlobsCompleted, |
GetWeakPtr())); |
return; |
@@ -582,70 +592,16 @@ ServiceWorkerURLRequestJob::CreateFetchRequest() { |
void ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid, |
uint64_t* blob_size) { |
DCHECK(HasRequestBody()); |
- // To ensure the blobs stick around until the end of the reading. |
- std::vector<std::unique_ptr<storage::BlobDataHandle>> handles; |
- std::vector<std::unique_ptr<storage::BlobDataSnapshot>> snapshots; |
- // TODO(dmurph): Allow blobs to be added below, so that the context can |
- // efficiently re-use blob items for the new blob. |
- std::vector<const ResourceRequestBodyImpl::Element*> resolved_elements; |
- for (const ResourceRequestBodyImpl::Element& element : (*body_->elements())) { |
- if (element.type() != ResourceRequestBodyImpl::Element::TYPE_BLOB) { |
- resolved_elements.push_back(&element); |
- continue; |
- } |
- std::unique_ptr<storage::BlobDataHandle> handle = |
- blob_storage_context_->GetBlobDataFromUUID(element.blob_uuid()); |
- std::unique_ptr<storage::BlobDataSnapshot> snapshot = |
- handle->CreateSnapshot(); |
- if (snapshot->items().empty()) |
- continue; |
- const auto& items = snapshot->items(); |
- for (const auto& item : items) { |
- DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type()); |
- resolved_elements.push_back(item->data_element_ptr()); |
- } |
- handles.push_back(std::move(handle)); |
- snapshots.push_back(std::move(snapshot)); |
- } |
- |
const std::string uuid(base::GenerateGUID()); |
- uint64_t total_size = 0; |
- |
storage::BlobDataBuilder blob_builder(uuid); |
- for (size_t i = 0; i < resolved_elements.size(); ++i) { |
- const ResourceRequestBodyImpl::Element& element = *resolved_elements[i]; |
- if (total_size != std::numeric_limits<uint64_t>::max() && |
- element.length() != std::numeric_limits<uint64_t>::max()) |
- total_size += element.length(); |
- else |
- total_size = std::numeric_limits<uint64_t>::max(); |
falken
2016/07/22 04:22:19
Seems we can get rid of #include <limits> now. May
dmurph
2016/08/02 00:58:02
Done.
|
- switch (element.type()) { |
- case ResourceRequestBodyImpl::Element::TYPE_BYTES: |
- blob_builder.AppendData(element.bytes(), element.length()); |
- break; |
- case ResourceRequestBodyImpl::Element::TYPE_FILE: |
- blob_builder.AppendFile(element.path(), element.offset(), |
- element.length(), |
- element.expected_modification_time()); |
- break; |
- case ResourceRequestBodyImpl::Element::TYPE_BLOB: |
- // Blob elements should be resolved beforehand. |
- NOTREACHED(); |
- break; |
- case ResourceRequestBodyImpl::Element::TYPE_FILE_FILESYSTEM: |
- blob_builder.AppendFileSystemFile(element.filesystem_url(), |
- element.offset(), element.length(), |
- element.expected_modification_time()); |
- break; |
- default: |
- NOTIMPLEMENTED(); |
- } |
falken
2016/07/22 04:22:19
nice deletion!
|
+ for (const ResourceRequestBodyImpl::Element& element : (*body_->elements())) { |
+ blob_builder.AppendIPCDataElement(element); |
} |
request_body_blob_data_handle_ = |
blob_storage_context_->AddFinishedBlob(&blob_builder); |
*blob_uuid = uuid; |
- *blob_size = total_size; |
+ *blob_size = request_body_blob_data_handle_->size(); |
} |
void ServiceWorkerURLRequestJob::DidPrepareFetchEvent( |