Index: Source/modules/serviceworkers/ServiceWorkerClients.cpp |
diff --git a/Source/modules/serviceworkers/ServiceWorkerClients.cpp b/Source/modules/serviceworkers/ServiceWorkerClients.cpp |
index 33e6fe7f99eb0c03e4f184af5b3b8fd486e5584d..7282fc0fd7b8ef18e2b6724b1a05bd36d6731542 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 Vector<RefPtr<Client> > from(ScriptPromiseResolver*, WebType* webClientsRaw) |
+ static WillBeHeapVector<RefPtrWillBeMember<Client> > from(ScriptPromiseResolver*, WebType* webClientsRaw) |
{ |
OwnPtr<WebType> webClients = adoptPtr(webClientsRaw); |
- Vector<RefPtr<Client> > clients; |
+ WillBeHeapVector<RefPtrWillBeMember<Client> > clients; |
for (size_t i = 0; i < webClients->clientIDs.size(); ++i) { |
clients.append(Client::create(webClients->clientIDs[i])); |
} |
@@ -38,9 +38,9 @@ namespace { |
} // namespace |
-PassRefPtr<ServiceWorkerClients> ServiceWorkerClients::create() |
+PassRefPtrWillBeRawPtr<ServiceWorkerClients> ServiceWorkerClients::create() |
{ |
- return adoptRef(new ServiceWorkerClients()); |
+ return adoptRefWillBeNoop(new ServiceWorkerClients()); |
} |
ServiceWorkerClients::ServiceWorkerClients() |
@@ -48,9 +48,7 @@ ServiceWorkerClients::ServiceWorkerClients() |
ScriptWrappable::init(this); |
} |
-ServiceWorkerClients::~ServiceWorkerClients() |
-{ |
-} |
+DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClients); |
ScriptPromise ServiceWorkerClients::getServiced(ScriptState* scriptState) |
{ |