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

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

Issue 877623002: [ServiceWorker] Fills SSLInfo of the response from a SW with the SSLInfo of the SW script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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_context_request_handler. h" 5 #include "content/browser/service_worker/service_worker_context_request_handler. h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "content/browser/service_worker/service_worker_context_core.h" 8 #include "content/browser/service_worker/service_worker_context_core.h"
9 #include "content/browser/service_worker/service_worker_provider_host.h" 9 #include "content/browser/service_worker/service_worker_provider_host.h"
10 #include "content/browser/service_worker/service_worker_read_from_cache_job.h" 10 #include "content/browser/service_worker/service_worker_read_from_cache_job.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 resource_type_, 76 resource_type_,
77 context_, 77 context_,
78 version_.get(), 78 version_.get(),
79 extra_load_flags, 79 extra_load_flags,
80 response_id); 80 response_id);
81 } 81 }
82 82
83 int64 response_id = kInvalidServiceWorkerResponseId; 83 int64 response_id = kInvalidServiceWorkerResponseId;
84 if (ShouldReadFromScriptCache(request->url(), &response_id)) { 84 if (ShouldReadFromScriptCache(request->url(), &response_id)) {
85 return new ServiceWorkerReadFromCacheJob( 85 return new ServiceWorkerReadFromCacheJob(
86 request, network_delegate, context_, response_id); 86 request, network_delegate, context_, version_, response_id);
87 } 87 }
88 88
89 // NULL means use the network. 89 // NULL means use the network.
90 return NULL; 90 return NULL;
91 } 91 }
92 92
93 void ServiceWorkerContextRequestHandler::GetExtraResponseInfo( 93 void ServiceWorkerContextRequestHandler::GetExtraResponseInfo(
94 bool* was_fetched_via_service_worker, 94 bool* was_fetched_via_service_worker,
95 bool* was_fallback_required_by_service_worker, 95 bool* was_fallback_required_by_service_worker,
96 GURL* original_url_via_service_worker, 96 GURL* original_url_via_service_worker,
(...skipping 23 matching lines...) Expand all
120 const GURL& url, int64* response_id_out) { 120 const GURL& url, int64* response_id_out) {
121 // We don't read from the script cache until the version is INSTALLED. 121 // We don't read from the script cache until the version is INSTALLED.
122 if (version_->status() == ServiceWorkerVersion::NEW || 122 if (version_->status() == ServiceWorkerVersion::NEW ||
123 version_->status() == ServiceWorkerVersion::INSTALLING) 123 version_->status() == ServiceWorkerVersion::INSTALLING)
124 return false; 124 return false;
125 *response_id_out = version_->script_cache_map()->LookupResourceId(url); 125 *response_id_out = version_->script_cache_map()->LookupResourceId(url);
126 return *response_id_out != kInvalidServiceWorkerResponseId; 126 return *response_id_out != kInvalidServiceWorkerResponseId;
127 } 127 }
128 128
129 } // namespace content 129 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698