Commit eaa289e9 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot

Add more wrapper methods to ServiceWorkerRegistry

This is similar to crrev.com/c/2026776 but for following methods:
* UpdateLastUpdateCheckTime()
* UpdateNavigationPreloadEnabled()
* UpdateNavigationPreloadHeader()

The motivation behind this change is to move status type
conversions (ServiceWorkerDatabase::Status ->
blink::ServiceWorkerStatusCode) from ServiceWorkerStorage
to ServiceWorkerRegistry. There are two reasons for this move:
* ServiceWorkerStorage will be encapsulated in a mojo interface
  and wouldn't be able to use blink::ServiceWorkerStatusCode
  once it's moved to the storage service.
* Consistency. Some methods in ServiceWorkerStorage use
  blink::ServiceWorkerStatusCode and others use
  ServiceWorkerDatabase::Status. It would be better to use
  a single status type.

A follow-up CL will move the status type conversion.

Bug: 1055677
Change-Id: I779fb16d4baceaf2a40ca7200fb28ab72e4334ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071339
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744519}
parent 77031cbc
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "content/browser/service_worker/service_worker_job_coordinator.h" #include "content/browser/service_worker/service_worker_job_coordinator.h"
#include "content/browser/service_worker/service_worker_metrics.h" #include "content/browser/service_worker/service_worker_metrics.h"
#include "content/browser/service_worker/service_worker_registration.h" #include "content/browser/service_worker/service_worker_registration.h"
#include "content/browser/service_worker/service_worker_storage.h" #include "content/browser/service_worker/service_worker_registry.h"
#include "content/browser/service_worker/service_worker_version.h" #include "content/browser/service_worker/service_worker_version.h"
#include "content/browser/url_loader_factory_getter.h" #include "content/browser/url_loader_factory_getter.h"
#include "content/common/service_worker/service_worker_utils.h" #include "content/common/service_worker/service_worker_utils.h"
...@@ -843,7 +843,7 @@ void ServiceWorkerRegisterJob::BumpLastUpdateCheckTimeIfNeeded() { ...@@ -843,7 +843,7 @@ void ServiceWorkerRegisterJob::BumpLastUpdateCheckTimeIfNeeded() {
registration()->set_last_update_check(base::Time::Now()); registration()->set_last_update_check(base::Time::Now());
if (registration()->newest_installed_version()) { if (registration()->newest_installed_version()) {
context_->storage()->UpdateLastUpdateCheckTime( context_->registry()->UpdateLastUpdateCheckTime(
registration()->id(), registration()->scope().GetOrigin(), registration()->id(), registration()->scope().GetOrigin(),
registration()->last_update_check(), registration()->last_update_check(),
base::BindOnce([](blink::ServiceWorkerStatusCode status) { base::BindOnce([](blink::ServiceWorkerStatusCode status) {
......
...@@ -285,7 +285,7 @@ void ServiceWorkerRegistrationObjectHost::EnableNavigationPreload( ...@@ -285,7 +285,7 @@ void ServiceWorkerRegistrationObjectHost::EnableNavigationPreload(
return; return;
} }
context_->storage()->UpdateNavigationPreloadEnabled( context_->registry()->UpdateNavigationPreloadEnabled(
registration_->id(), registration_->scope().GetOrigin(), enable, registration_->id(), registration_->scope().GetOrigin(), enable,
base::AdaptCallbackForRepeating(base::BindOnce( base::AdaptCallbackForRepeating(base::BindOnce(
&ServiceWorkerRegistrationObjectHost:: &ServiceWorkerRegistrationObjectHost::
...@@ -335,7 +335,7 @@ void ServiceWorkerRegistrationObjectHost::SetNavigationPreloadHeader( ...@@ -335,7 +335,7 @@ void ServiceWorkerRegistrationObjectHost::SetNavigationPreloadHeader(
return; return;
} }
context_->storage()->UpdateNavigationPreloadHeader( context_->registry()->UpdateNavigationPreloadHeader(
registration_->id(), registration_->scope().GetOrigin(), value, registration_->id(), registration_->scope().GetOrigin(), value,
base::AdaptCallbackForRepeating(base::BindOnce( base::AdaptCallbackForRepeating(base::BindOnce(
&ServiceWorkerRegistrationObjectHost:: &ServiceWorkerRegistrationObjectHost::
......
...@@ -97,13 +97,13 @@ class CONTENT_EXPORT ServiceWorkerRegistrationObjectHost ...@@ -97,13 +97,13 @@ class CONTENT_EXPORT ServiceWorkerRegistrationObjectHost
// complete. // complete.
void UnregistrationComplete(UnregisterCallback callback, void UnregistrationComplete(UnregisterCallback callback,
blink::ServiceWorkerStatusCode status); blink::ServiceWorkerStatusCode status);
// Called back from ServiceWorkerStorage when setting navigation preload is // Called back from ServiceWorkerRegistry when setting navigation preload is
// complete. // complete.
void DidUpdateNavigationPreloadEnabled( void DidUpdateNavigationPreloadEnabled(
bool enable, bool enable,
EnableNavigationPreloadCallback callback, EnableNavigationPreloadCallback callback,
blink::ServiceWorkerStatusCode status); blink::ServiceWorkerStatusCode status);
// Called back from ServiceWorkerStorage when setting navigation preload // Called back from ServiceWorkerRegistry when setting navigation preload
// header is complete. // header is complete.
void DidUpdateNavigationPreloadHeader( void DidUpdateNavigationPreloadHeader(
const std::string& value, const std::string& value,
......
...@@ -353,6 +353,33 @@ void ServiceWorkerRegistry::UpdateToActiveState(int64_t registration_id, ...@@ -353,6 +353,33 @@ void ServiceWorkerRegistry::UpdateToActiveState(int64_t registration_id,
weak_factory_.GetWeakPtr(), std::move(callback))); weak_factory_.GetWeakPtr(), std::move(callback)));
} }
void ServiceWorkerRegistry::UpdateLastUpdateCheckTime(
int64_t registration_id,
const GURL& origin,
base::Time last_update_check_time,
StatusCallback callback) {
storage()->UpdateLastUpdateCheckTime(
registration_id, origin, last_update_check_time, std::move(callback));
}
void ServiceWorkerRegistry::UpdateNavigationPreloadEnabled(
int64_t registration_id,
const GURL& origin,
bool enable,
StatusCallback callback) {
storage()->UpdateNavigationPreloadEnabled(registration_id, origin, enable,
std::move(callback));
}
void ServiceWorkerRegistry::UpdateNavigationPreloadHeader(
int64_t registration_id,
const GURL& origin,
const std::string& value,
StatusCallback callback) {
storage()->UpdateNavigationPreloadHeader(registration_id, origin, value,
std::move(callback));
}
void ServiceWorkerRegistry::StoreUncommittedResourceId(int64_t resource_id) { void ServiceWorkerRegistry::StoreUncommittedResourceId(int64_t resource_id) {
storage()->StoreUncommittedResourceId( storage()->StoreUncommittedResourceId(
resource_id, resource_id,
......
...@@ -175,6 +175,18 @@ class CONTENT_EXPORT ServiceWorkerRegistry { ...@@ -175,6 +175,18 @@ class CONTENT_EXPORT ServiceWorkerRegistry {
void UpdateToActiveState(int64_t registration_id, void UpdateToActiveState(int64_t registration_id,
const GURL& origin, const GURL& origin,
StatusCallback callback); StatusCallback callback);
void UpdateLastUpdateCheckTime(int64_t registration_id,
const GURL& origin,
base::Time last_update_check_time,
StatusCallback callback);
void UpdateNavigationPreloadEnabled(int64_t registration_id,
const GURL& origin,
bool enable,
StatusCallback callback);
void UpdateNavigationPreloadHeader(int64_t registration_id,
const GURL& origin,
const std::string& value,
StatusCallback callback);
void StoreUncommittedResourceId(int64_t resource_id); void StoreUncommittedResourceId(int64_t resource_id);
void DoomUncommittedResource(int64_t resource_id); void DoomUncommittedResource(int64_t resource_id);
void DoomUncommittedResources(const std::set<int64_t>& resource_ids); void DoomUncommittedResources(const std::set<int64_t>& resource_ids);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment