| Index: content/browser/devtools/protocol/service_worker_handler.cc
|
| diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc
|
| index b2f5c2572b7ff0301ee84e2fa3ae22c7d0d3e034..9d0b85eba0fc98880cdf8c49edb1086abb321971 100644
|
| --- a/content/browser/devtools/protocol/service_worker_handler.cc
|
| +++ b/content/browser/devtools/protocol/service_worker_handler.cc
|
| @@ -250,7 +250,7 @@ void ServiceWorkerHandler::SetRenderFrameHost(
|
| render_frame_host_ = render_frame_host;
|
| // Do not call UpdateHosts yet, wait for load to commit.
|
| if (!render_frame_host) {
|
| - ClearForceUpdate();
|
| + ClearOverrides();
|
| context_ = nullptr;
|
| return;
|
| }
|
| @@ -327,7 +327,7 @@ Response ServiceWorkerHandler::Disable() {
|
| enabled_ = false;
|
|
|
| ServiceWorkerDevToolsManager::GetInstance()->RemoveObserver(this);
|
| - ClearForceUpdate();
|
| + ClearOverrides();
|
| for (const auto& pair : attached_hosts_)
|
| pair.second->DetachClient();
|
| attached_hosts_.clear();
|
| @@ -414,11 +414,19 @@ Response ServiceWorkerHandler::InspectWorker(const std::string& version_id) {
|
| return Response::OK();
|
| }
|
|
|
| -Response ServiceWorkerHandler::SetForceUpdateOnPageLoad(
|
| - bool force_update_on_page_load) {
|
| +Response ServiceWorkerHandler::SetUpdateOnPageLoad(
|
| + bool update_on_page_load) {
|
| if (!context_)
|
| return CreateContextErrorResponse();
|
| - context_->SetForceUpdateOnPageLoad(force_update_on_page_load);
|
| + context_->SetUpdateOnPageLoadForDevTools(update_on_page_load);
|
| + return Response::OK();
|
| +}
|
| +
|
| +Response ServiceWorkerHandler::SetFallbackToNetwork(
|
| + bool fall_back) {
|
| + if (!context_)
|
| + return CreateContextErrorResponse();
|
| + context_->SetFallbackToNetworkForDevTools(fall_back);
|
| return Response::OK();
|
| }
|
|
|
| @@ -588,9 +596,11 @@ void ServiceWorkerHandler::ReportWorkerTerminated(
|
| attached_hosts_.erase(it);
|
| }
|
|
|
| -void ServiceWorkerHandler::ClearForceUpdate() {
|
| - if (context_)
|
| - context_->SetForceUpdateOnPageLoad(false);
|
| +void ServiceWorkerHandler::ClearOverrides() {
|
| + if (context_) {
|
| + context_->SetUpdateOnPageLoadForDevTools(false);
|
| + context_->SetFallbackToNetworkForDevTools(false);
|
| + }
|
| }
|
|
|
| } // namespace service_worker
|
|
|