Index: Source/modules/serviceworkers/ServiceWorkerClients.cpp |
diff --git a/Source/modules/serviceworkers/ServiceWorkerClients.cpp b/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
index c528e527be0c033f8dde0b35dbcf1f48a8940e3d..e4738d46a8518d18b9cdb0e44c39e6003af4524b 100644 |
--- a/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
+++ b/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
@@ -21,10 +21,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])); |
} |
@@ -42,9 +42,9 @@ namespace { |
} // namespace |
-PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create() |
+ServiceWorkerClients* ServiceWorkerClients::create() |
dominicc (has gone to gerrit)
2014/08/26 14:01:34
Ditto.
|
{ |
- return adoptRefWillBeNoop(new ServiceWorkerClients()); |
+ return new ServiceWorkerClients(); |
} |
ServiceWorkerClients::ServiceWorkerClients() |
@@ -52,8 +52,6 @@ ServiceWorkerClients::ServiceWorkerClients() |
ScriptWrappable::init(this); |
} |
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients); |
- |
ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) |
{ |
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState); |