Add support for HTTP range requests in the AppCacheURLLoaderImpl class.

content/browser/appcache/appcache_url_loader_job.cc

 // Copyright (c) 2017 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 "content/browser/appcache/appcache_url_loader_job.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/appcache/appcache_histograms.h"
 #include "content/common/net_adapters.h"
 #include "content/public/common/resource_type.h"
@@ skipping 24 matching lines @@
   delivery_type_ = APPCACHED_DELIVERY;
 
   AppCacheHistograms::AddAppCacheJobStartDelaySample(base::TimeTicks::Now() -
                                                      start_time_tick_);
 
   manifest_url_ = manifest_url;
   cache_id_ = cache_id;
   entry_ = entry;
   is_fallback_ = is_fallback;
 
+  // Handle range requests.
+  net::HttpRequestHeaders headers;
+  headers.AddHeadersFromString(request_.headers);
+  InitializeRangeRequestInfo(headers);
+
   // TODO(ananta)
   // Implement the AppCacheServiceImpl::Observer interface or add weak pointer
   // support to it.
   storage_->LoadResponseInfo(manifest_url_, entry_.response_id(), this);
 }
 
 void AppCacheURLLoaderJob::DeliverNetworkResponse() {
   delivery_type_ = NETWORK_DELIVERY;
 
   AppCacheHistograms::AddNetworkJobStartDelaySample(base::TimeTicks::Now() -
@@ skipping 81 matching lines @@
   if (!storage_.get()) {
     DeliverErrorResponse();
     return;
   }
 
   if (response_info) {
     info_ = response_info;
     reader_.reset(
         storage_->CreateResponseReader(manifest_url_, entry_.response_id()));
 
+    if (is_range_request())
+      SetupRangeResponse(reader_.get());

[michaeln, 2017/06/14 02:37:25]

feels a little arbitrary that reader_ is passed in but info_ and range_header_
is not, maybe hoist reader_ into the base class too or don't hoist any and pass
them all as parameters?

[ananta, 2017/06/14 18:52:18]

Done. Moved reader_ to the base class

+
     DCHECK(!loader_callback_.is_null());
     std::move(loader_callback_)
         .Run(base::Bind(&AppCacheURLLoaderJob::Start, StaticAsWeakPtr(this)));
 
-    // TODO(ananta)
-    // Handle range requests.
-
     response_body_stream_ = std::move(data_pipe_.producer_handle);
 
     // TODO(ananta)
     // Move the asynchronous reading and mojo pipe handling code to a helper
     // class. That would also need a change to BlobURLLoader.
 
     // Wait for the data pipe to be ready to accept data.
     writable_handle_watcher_.Watch(
         response_body_stream_.get(), MOJO_HANDLE_SIGNAL_WRITABLE,
         base::Bind(&AppCacheURLLoaderJob::OnResponseBodyStreamReady,
@@ skipping 46 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 void AppCacheURLLoaderJob::SendResponseInfo() {
   DCHECK(client_info_);
 
   // If this is null it means the response information was sent to the client.
   if (!data_pipe_.consumer_handle.is_valid())
     return;
 
-  const net::HttpResponseInfo* http_info = info_->http_response_info();
+  const net::HttpResponseInfo* http_info = is_range_request()
+                                               ? range_response_info_.get()
+                                               : info_->http_response_info();
 
   ResourceResponseHead response_head;
   response_head.headers = http_info->headers;
 
   // TODO(ananta)
   // Copy more fields.
   http_info->headers->GetMimeType(&response_head.mime_type);
   http_info->headers->GetCharset(&response_head.charset);
 
   response_head.request_time = http_info->request_time;
   response_head.response_time = http_info->response_time;
-  response_head.content_length = info_->response_data_size();
+  response_head.content_length =
+      is_range_request() ? range_response_info_->headers->GetContentLength()
+                         : info_->response_data_size();
 
   client_info_->OnReceiveResponse(response_head, http_info->ssl_info,
                                   mojom::DownloadedTempFilePtr());
 
   client_info_->OnStartLoadingResponseBody(
       std::move(data_pipe_.consumer_handle));
 }
 
 void AppCacheURLLoaderJob::ReadMore() {
   DCHECK(!pending_write_.get());
@@ skipping 39 matching lines @@
   if (storage_.get())
     storage_->CancelDelegateCallbacks(this);
   // TODO(ananta)
   // Fill other details in the ResourceRequestCompletionStatus structure.
   ResourceRequestCompletionStatus request_complete_data;
   request_complete_data.error_code = error_code;
   client_info_->OnComplete(request_complete_data);
 }
 
 }  // namespace content