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

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

Issue 659573006: [ServiceWorker] pipe ServiceWorkerResponseType [2/2 chromium] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix error Created 6 years, 2 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
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,
97 blink::WebServiceWorkerResponseType* response_type_via_service_worker,
97 base::TimeTicks* fetch_start_time, 98 base::TimeTicks* fetch_start_time,
98 base::TimeTicks* fetch_ready_time, 99 base::TimeTicks* fetch_ready_time,
99 base::TimeTicks* fetch_end_time) const { 100 base::TimeTicks* fetch_end_time) const {
100 *was_fetched_via_service_worker = false; 101 *was_fetched_via_service_worker = false;
101 *was_fallback_required_by_service_worker = false; 102 *was_fallback_required_by_service_worker = false;
102 *original_url_via_service_worker = GURL(); 103 *original_url_via_service_worker = GURL();
104 *response_type_via_service_worker =
105 blink::WebServiceWorkerResponseTypeDefault;
103 } 106 }
104 107
105 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache( 108 bool ServiceWorkerContextRequestHandler::ShouldAddToScriptCache(
106 const GURL& url) { 109 const GURL& url) {
107 // We only write imports that occur during the initial eval. 110 // We only write imports that occur during the initial eval.
108 if (version_->status() != ServiceWorkerVersion::NEW && 111 if (version_->status() != ServiceWorkerVersion::NEW &&
109 version_->status() != ServiceWorkerVersion::INSTALLING) { 112 version_->status() != ServiceWorkerVersion::INSTALLING) {
110 return false; 113 return false;
111 } 114 }
112 return version_->script_cache_map()->Lookup(url) == 115 return version_->script_cache_map()->Lookup(url) ==
113 kInvalidServiceWorkerResponseId; 116 kInvalidServiceWorkerResponseId;
114 } 117 }
115 118
116 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache( 119 bool ServiceWorkerContextRequestHandler::ShouldReadFromScriptCache(
117 const GURL& url, int64* response_id_out) { 120 const GURL& url, int64* response_id_out) {
118 // 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.
119 if (version_->status() == ServiceWorkerVersion::NEW || 122 if (version_->status() == ServiceWorkerVersion::NEW ||
120 version_->status() == ServiceWorkerVersion::INSTALLING) 123 version_->status() == ServiceWorkerVersion::INSTALLING)
121 return false; 124 return false;
122 *response_id_out = version_->script_cache_map()->Lookup(url); 125 *response_id_out = version_->script_cache_map()->Lookup(url);
123 return *response_id_out != kInvalidServiceWorkerResponseId; 126 return *response_id_out != kInvalidServiceWorkerResponseId;
124 } 127 }
125 128
126 } // namespace content 129 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698