| Index: Source/modules/serviceworkers/ServiceWorkerClients.cpp
|
| diff --git a/Source/modules/serviceworkers/ServiceWorkerClients.cpp b/Source/modules/serviceworkers/ServiceWorkerClients.cpp
|
| index 499ae85fe11dd607ca61c6ac1fe6c471015fe7ad..d01716b08e831f2d98753ff80a88eac4d7752596 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorkerClients.cpp
|
| +++ b/Source/modules/serviceworkers/ServiceWorkerClients.cpp
|
| @@ -22,10 +22,10 @@ namespace {
|
| class ClientArray {
|
| public:
|
| typedef blink::WebServiceWorkerClientsInfo WebType;
|
| - static WillBeHeapVector<RefPtrWillBeMember<ServiceWorkerClient> > take(ScriptPromiseResolver*, WebType* webClientsRaw)
|
| + static HeapVector<Member<ServiceWorkerClient> > take(ScriptPromiseResolver*, WebType* webClientsRaw)
|
| {
|
| OwnPtr<WebType> webClients = adoptPtr(webClientsRaw);
|
| - WillBeHeapVector<RefPtrWillBeMember<ServiceWorkerClient> > clients;
|
| + HeapVector<Member<ServiceWorkerClient> > clients;
|
| for (size_t i = 0; i < webClients->clientIDs.size(); ++i) {
|
| clients.append(ServiceWorkerClient::create(webClients->clientIDs[i]));
|
| }
|
| @@ -43,9 +43,9 @@ namespace {
|
|
|
| } // namespace
|
|
|
| -PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create()
|
| +ServiceWorkerClients* ServiceWorkerClients::create()
|
| {
|
| - return adoptRefWillBeNoop(new ServiceWorkerClients());
|
| + return new ServiceWorkerClients();
|
| }
|
|
|
| ServiceWorkerClients::ServiceWorkerClients()
|
| @@ -53,8 +53,6 @@ ServiceWorkerClients::ServiceWorkerClients()
|
| ScriptWrappable::init(this);
|
| }
|
|
|
| -DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients);
|
| -
|
| ScriptPromise ServiceWorkerClients::getAll(ScriptState* scriptState, const Dictionary& options)
|
| {
|
| RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
|
|