| Index: Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| index 05143bed93162240915e36493db5e78a3465c3dc..93dfa951daf1f7e707f92f53a7de059b26868df4 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerRegistration.cpp
|
| @@ -95,10 +95,10 @@ void ServiceWorkerRegistration::setActive(WebServiceWorker* serviceWorker)
|
| m_active = ServiceWorker::from(executionContext(), serviceWorker);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::take(ScriptPromiseResolver* resolver, WebType* registration)
|
| +ServiceWorkerRegistration* ServiceWorkerRegistration::take(ScriptPromiseResolver* resolver, WebType* registration)
|
| {
|
| if (!registration)
|
| - return nullptr;
|
| + return 0;
|
| return getOrCreate(resolver->scriptState()->executionContext(), registration);
|
| }
|
|
|
| @@ -138,10 +138,10 @@ ScriptPromise ServiceWorkerRegistration::unregister(ScriptState* scriptState)
|
| return promise;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
|
| +ServiceWorkerRegistration* ServiceWorkerRegistration::getOrCreate(ExecutionContext* executionContext, WebServiceWorkerRegistration* outerRegistration)
|
| {
|
| if (!outerRegistration)
|
| - return nullptr;
|
| + return 0;
|
|
|
| WebServiceWorkerRegistrationProxy* proxy = outerRegistration->proxy();
|
| if (proxy) {
|
| @@ -152,9 +152,9 @@ PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> ServiceWorkerRegistration::get
|
| }
|
| }
|
|
|
| - RefPtrWillBeRawPtr<ServiceWorkerRegistration> registration = adoptRefWillBeNoop(new ServiceWorkerRegistration(executionContext, adoptPtr(outerRegistration)));
|
| + ServiceWorkerRegistration* registration = adoptRefCountedGarbageCollectedWillBeNoop(new ServiceWorkerRegistration(executionContext, adoptPtr(outerRegistration)));
|
| registration->suspendIfNeeded();
|
| - return registration.release();
|
| + return registration;
|
| }
|
|
|
| ServiceWorkerRegistration::ServiceWorkerRegistration(ExecutionContext* executionContext, PassOwnPtr<WebServiceWorkerRegistration> outerRegistration)
|
|
|