Index: content/browser/service_worker/service_worker_version.h |
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h |
index 9b88f791b286971ad5e1ad1853fa8260df2dfe62..697d77510439ea2f029834cffc4f2c2266dc084c 100644 |
--- a/content/browser/service_worker/service_worker_version.h |
+++ b/content/browser/service_worker/service_worker_version.h |
@@ -26,6 +26,7 @@ |
#include "base/threading/thread_task_runner_handle.h" |
#include "base/timer/timer.h" |
#include "content/browser/service_worker/embedded_worker_instance.h" |
+#include "content/browser/service_worker/embedded_worker_status.h" |
#include "content/browser/service_worker/service_worker_metrics.h" |
#include "content/browser/service_worker/service_worker_script_cache_map.h" |
#include "content/common/content_export.h" |
@@ -66,13 +67,7 @@ class CONTENT_EXPORT ServiceWorkerVersion |
public EmbeddedWorkerInstance::Listener { |
public: |
typedef base::Callback<void(ServiceWorkerStatusCode)> StatusCallback; |
- |
- enum RunningStatus { |
- STOPPED = EmbeddedWorkerInstance::STOPPED, |
- STARTING = EmbeddedWorkerInstance::STARTING, |
- RUNNING = EmbeddedWorkerInstance::RUNNING, |
- STOPPING = EmbeddedWorkerInstance::STOPPING, |
- }; |
+ typedef EmbeddedWorkerStatus RunningStatus; |
falken
2016/06/07 03:46:12
I'm not sure this typedef is an improvement. Can w
horo
2016/06/07 05:58:12
Done.
|
// Current version status; some of the status (e.g. INSTALLED and ACTIVATED) |
// should be persisted unlike running status. |
@@ -132,9 +127,7 @@ class CONTENT_EXPORT ServiceWorkerVersion |
int64_t registration_id() const { return registration_id_; } |
const GURL& script_url() const { return script_url_; } |
const GURL& scope() const { return scope_; } |
- RunningStatus running_status() const { |
- return static_cast<RunningStatus>(embedded_worker_->status()); |
- } |
+ RunningStatus running_status() const { return embedded_worker_->status(); } |
ServiceWorkerVersionInfo GetInfo(); |
Status status() const { return status_; } |
bool has_fetch_handler() const { return has_fetch_handler_; } |
@@ -295,6 +288,10 @@ class CONTENT_EXPORT ServiceWorkerVersion |
bool skip_waiting() const { return skip_waiting_; } |
void set_skip_waiting(bool skip_waiting) { skip_waiting_ = skip_waiting; } |
+ bool skip_recording_startup_time() const { |
+ return skip_recording_startup_time_; |
+ } |
+ |
bool force_bypass_cache_for_scripts() const { |
return force_bypass_cache_for_scripts_; |
} |
@@ -687,7 +684,7 @@ class CONTENT_EXPORT ServiceWorkerVersion |
template <typename Interface> |
base::WeakPtr<Interface> ServiceWorkerVersion::GetMojoServiceForRequest( |
int request_id) { |
- DCHECK_EQ(RUNNING, running_status()); |
+ DCHECK_EQ(RunningStatus::RUNNING, running_status()); |
PendingRequest<StatusCallback>* request = custom_requests_.Lookup(request_id); |
DCHECK(request) << "Invalid request id"; |
DCHECK(!request->mojo_service) |
@@ -714,7 +711,7 @@ template <typename ResponseMessage, typename ResponseCallbackType> |
void ServiceWorkerVersion::DispatchEvent(int request_id, |
const IPC::Message& message, |
const ResponseCallbackType& callback) { |
- DCHECK_EQ(RUNNING, running_status()); |
+ DCHECK_EQ(RunningStatus::RUNNING, running_status()); |
PendingRequest<StatusCallback>* request = custom_requests_.Lookup(request_id); |
DCHECK(request) << "Invalid request id"; |
DCHECK(!request->listener) << "Request already dispatched an IPC event"; |