Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp |
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp |
index d5f53676d2166ff35b680af47b94f8cb43fe89eb..8c1a97138eb3ccf68f4ac34cb97dcfe5cd71df16 100644 |
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp |
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp |
@@ -119,8 +119,6 @@ ServiceWorker* ServiceWorker::from(ExecutionContext* executionContext, PassOwnPt |
bool ServiceWorker::hasPendingActivity() const |
{ |
- if (AbstractWorker::hasPendingActivity()) |
- return true; |
if (m_wasStopped) |
return false; |
return m_handle->serviceWorker()->state() != WebServiceWorkerStateRedundant; |
@@ -149,6 +147,7 @@ ServiceWorker* ServiceWorker::getOrCreate(ExecutionContext* executionContext, Pa |
ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorker::Handle> handle) |
: AbstractWorker(executionContext) |
+ , ActiveScriptWrappable(this) |
, m_handle(handle) |
, m_wasStopped(false) |
{ |