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

Side by Side Diff: content/browser/service_worker/service_worker_url_request_job.cc

Issue 810403004: [Storage] Blob Storage Refactoring pt 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: memory leak fixed Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/service_worker/service_worker_url_request_job.h" 5 #include "content/browser/service_worker/service_worker_url_request_job.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/guid.h" 12 #include "base/guid.h"
13 #include "base/memory/scoped_vector.h"
13 #include "base/profiler/scoped_tracker.h" 14 #include "base/profiler/scoped_tracker.h"
14 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
15 #include "base/time/time.h" 16 #include "base/time/time.h"
16 #include "content/browser/resource_context_impl.h" 17 #include "content/browser/resource_context_impl.h"
17 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 18 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
18 #include "content/browser/service_worker/service_worker_provider_host.h" 19 #include "content/browser/service_worker/service_worker_provider_host.h"
19 #include "content/browser/streams/stream.h" 20 #include "content/browser/streams/stream.h"
20 #include "content/browser/streams/stream_context.h" 21 #include "content/browser/streams/stream_context.h"
21 #include "content/browser/streams/stream_registry.h" 22 #include "content/browser/streams/stream_registry.h"
22 #include "content/common/resource_request_body.h" 23 #include "content/common/resource_request_body.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 info->GetPageTransition(), ui::PAGE_TRANSITION_RELOAD); 403 info->GetPageTransition(), ui::PAGE_TRANSITION_RELOAD);
403 } 404 }
404 return request.Pass(); 405 return request.Pass();
405 } 406 }
406 407
407 bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid, 408 bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid,
408 uint64* blob_size) { 409 uint64* blob_size) {
409 if (!body_.get() || !blob_storage_context_) 410 if (!body_.get() || !blob_storage_context_)
410 return false; 411 return false;
411 412
413 // To ensure the blobs stick around until the end of the reading.
414 ScopedVector<storage::BlobDataSnapshotHandle> handles;
412 std::vector<const ResourceRequestBody::Element*> resolved_elements; 415 std::vector<const ResourceRequestBody::Element*> resolved_elements;
413 for (size_t i = 0; i < body_->elements()->size(); ++i) { 416 for (const ResourceRequestBody::Element& element : (*body_->elements())) {
414 const ResourceRequestBody::Element& element = (*body_->elements())[i];
415 if (element.type() != ResourceRequestBody::Element::TYPE_BLOB) { 417 if (element.type() != ResourceRequestBody::Element::TYPE_BLOB) {
416 resolved_elements.push_back(&element); 418 resolved_elements.push_back(&element);
417 continue; 419 continue;
418 } 420 }
419 scoped_ptr<storage::BlobDataHandle> handle = 421 scoped_ptr<storage::BlobDataSnapshotHandle> handle =
420 blob_storage_context_->GetBlobDataFromUUID(element.blob_uuid()); 422 blob_storage_context_->GetBlobDataFromUUID(element.blob_uuid());
421 if (handle->data()->items().empty()) 423 if (handle->data()->items().empty())
422 continue; 424 continue;
423 for (size_t i = 0; i < handle->data()->items().size(); ++i) { 425 const auto& items = handle->data()->items();
424 const storage::BlobData::Item& item = handle->data()->items().at(i); 426 for (const auto& item : items) {
425 DCHECK_NE(storage::BlobData::Item::TYPE_BLOB, item.type()); 427 DCHECK_NE(storage::DataElement::TYPE_BLOB, item->type());
426 resolved_elements.push_back(&item); 428 resolved_elements.push_back(item->data_element_ptr());
427 } 429 }
430 handles.push_back(handle.release());
428 } 431 }
429 432
430 const std::string uuid(base::GenerateGUID()); 433 const std::string uuid(base::GenerateGUID());
431 uint64 total_size = 0; 434 uint64 total_size = 0;
432 scoped_refptr<storage::BlobData> blob_data = new storage::BlobData(uuid); 435 scoped_ptr<storage::BlobDataBuilder> blob_data(
436 new storage::BlobDataBuilder(uuid));
433 for (size_t i = 0; i < resolved_elements.size(); ++i) { 437 for (size_t i = 0; i < resolved_elements.size(); ++i) {
434 const ResourceRequestBody::Element& element = *resolved_elements[i]; 438 const ResourceRequestBody::Element& element = *resolved_elements[i];
435 if (total_size != kuint64max && element.length() != kuint64max) 439 if (total_size != kuint64max && element.length() != kuint64max)
436 total_size += element.length(); 440 total_size += element.length();
437 else 441 else
438 total_size = kuint64max; 442 total_size = kuint64max;
439 switch (element.type()) { 443 switch (element.type()) {
440 case ResourceRequestBody::Element::TYPE_BYTES: 444 case ResourceRequestBody::Element::TYPE_BYTES:
441 blob_data->AppendData(element.bytes(), element.length()); 445 blob_data->AppendData(element.bytes(), element.length());
442 break; 446 break;
443 case ResourceRequestBody::Element::TYPE_FILE: 447 case ResourceRequestBody::Element::TYPE_FILE:
444 blob_data->AppendFile(element.path(), 448 blob_data->AppendFile(element.path(), element.offset(),
445 element.offset(),
446 element.length(), 449 element.length(),
447 element.expected_modification_time()); 450 element.expected_modification_time(),
451 scoped_refptr<storage::ShareableFileReference>());
448 break; 452 break;
449 case ResourceRequestBody::Element::TYPE_BLOB: 453 case ResourceRequestBody::Element::TYPE_BLOB:
450 // Blob elements should be resolved beforehand. 454 // Blob elements should be resolved beforehand.
451 NOTREACHED(); 455 NOTREACHED();
452 break; 456 break;
453 case ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM: 457 case ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM:
454 blob_data->AppendFileSystemFile(element.filesystem_url(), 458 blob_data->AppendFileSystemFile(element.filesystem_url(),
455 element.offset(), 459 element.offset(),
456 element.length(), 460 element.length(),
457 element.expected_modification_time()); 461 element.expected_modification_time());
458 break; 462 break;
459 default: 463 default:
460 NOTIMPLEMENTED(); 464 NOTIMPLEMENTED();
461 } 465 }
462 } 466 }
463 467
464 request_body_blob_data_handle_ = 468 request_body_blob_data_handle_ =
465 blob_storage_context_->AddFinishedBlob(blob_data.get()); 469 blob_storage_context_->AddFinishedBlob(*blob_data.get());
466 *blob_uuid = uuid; 470 *blob_uuid = uuid;
467 *blob_size = total_size; 471 *blob_size = total_size;
468 return true; 472 return true;
469 } 473 }
470 474
471 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent() { 475 void ServiceWorkerURLRequestJob::DidPrepareFetchEvent() {
472 fetch_ready_time_ = base::TimeTicks::Now(); 476 fetch_ready_time_ = base::TimeTicks::Now();
473 } 477 }
474 478
475 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent( 479 void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 stream_context->registry()->SetRegisterObserver(waiting_stream_url_, 547 stream_context->registry()->SetRegisterObserver(waiting_stream_url_,
544 this); 548 this);
545 return; 549 return;
546 } 550 }
547 stream_->SetReadObserver(this); 551 stream_->SetReadObserver(this);
548 CommitResponseHeader(); 552 CommitResponseHeader();
549 return; 553 return;
550 } 554 }
551 // Set up a request for reading the blob. 555 // Set up a request for reading the blob.
552 if (!response.blob_uuid.empty() && blob_storage_context_) { 556 if (!response.blob_uuid.empty() && blob_storage_context_) {
553 scoped_ptr<storage::BlobDataHandle> blob_data_handle = 557 scoped_ptr<storage::BlobDataSnapshotHandle> blob_data_handle =
554 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid); 558 blob_storage_context_->GetBlobDataFromUUID(response.blob_uuid);
555 if (!blob_data_handle) { 559 if (!blob_data_handle) {
556 // The renderer gave us a bad blob UUID. 560 // The renderer gave us a bad blob UUID.
557 DeliverErrorResponse(); 561 DeliverErrorResponse();
558 return; 562 return;
559 } 563 }
560 blob_request_ = storage::BlobProtocolHandler::CreateBlobRequest( 564 blob_request_ = storage::BlobProtocolHandler::CreateBlobRequest(
561 blob_data_handle.Pass(), request()->context(), this); 565 blob_data_handle.Pass(), request()->context(), this);
562 blob_request_->Start(); 566 blob_request_->Start();
563 } 567 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 } 623 }
620 if (!waiting_stream_url_.is_empty()) { 624 if (!waiting_stream_url_.is_empty()) {
621 StreamRegistry* stream_registry = 625 StreamRegistry* stream_registry =
622 GetStreamContextForResourceContext(resource_context_)->registry(); 626 GetStreamContextForResourceContext(resource_context_)->registry();
623 stream_registry->RemoveRegisterObserver(waiting_stream_url_); 627 stream_registry->RemoveRegisterObserver(waiting_stream_url_);
624 stream_registry->AbortPendingStream(waiting_stream_url_); 628 stream_registry->AbortPendingStream(waiting_stream_url_);
625 } 629 }
626 } 630 }
627 631
628 } // namespace content 632 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698