Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Make changes requested by danakj, fix a few more headers Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index 61ffad01c2551267851f0e91209cd7ba38a02460..4dd20215f9464f89778892f0394d1c22daa38a33 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -58,6 +58,7 @@
#include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
#include "wtf/PtrUtil.h"
#include <memory>
+#include <utility>
namespace blink {
@@ -321,7 +322,8 @@ void ServiceWorkerContainer::registerServiceWorkerImpl(
}
}
- m_provider->registerServiceWorker(patternURL, scriptURL, callbacks.release());
+ m_provider->registerServiceWorker(patternURL, scriptURL,
+ std::move(callbacks));
}
ScriptPromise ServiceWorkerContainer::registerServiceWorker(
@@ -413,8 +415,8 @@ ScriptPromise ServiceWorkerContainer::getRegistration(
documentOrigin->toString() + "')."));
return promise;
}
- m_provider->getRegistration(completedURL,
- new GetRegistrationCallback(resolver));
+ m_provider->getRegistration(
+ completedURL, WTF::makeUnique<GetRegistrationCallback>(resolver));
return promise;
}
@@ -451,7 +453,8 @@ ScriptPromise ServiceWorkerContainer::getRegistrations(
return promise;
}
- m_provider->getRegistrations(new GetRegistrationsCallback(resolver));
+ m_provider->getRegistrations(
+ WTF::makeUnique<GetRegistrationsCallback>(resolver));
return promise;
}
@@ -476,9 +479,10 @@ ScriptPromise ServiceWorkerContainer::ready(ScriptState* callerState) {
if (!m_ready) {
m_ready = createReadyProperty();
- if (m_provider)
+ if (m_provider) {
m_provider->getRegistrationForReady(
- new GetRegistrationForReadyCallback(m_ready.get()));
+ WTF::makeUnique<GetRegistrationForReadyCallback>(m_ready.get()));
+ }
}
return m_ready->promise(callerState->world());

Powered by Google App Engine
This is Rietveld 408576698