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

Unified Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 months 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/web/WebEmbeddedWorkerImpl.h
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
index ff9f93bfeab58f9990f6ec131997538e441a9deb..fb89a67903581a11e61504d6bfe8d87b68af33e7 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
@@ -38,6 +38,7 @@
#include "public/web/WebEmbeddedWorker.h"
#include "public/web/WebEmbeddedWorkerStartData.h"
#include "public/web/WebFrameClient.h"
+#include <memory>
namespace blink {
@@ -56,7 +57,7 @@ class WebEmbeddedWorkerImpl final
, private WorkerLoaderProxyProvider {
WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl);
public:
- WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient>, PassOwnPtr<WebWorkerContentSettingsClientProxy>);
+ WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient>, std::unique_ptr<WebWorkerContentSettingsClientProxy>);
~WebEmbeddedWorkerImpl() override;
// WebEmbeddedWorker overrides.
@@ -94,20 +95,20 @@ private:
WebEmbeddedWorkerStartData m_workerStartData;
- OwnPtr<WebServiceWorkerContextClient> m_workerContextClient;
+ std::unique_ptr<WebServiceWorkerContextClient> m_workerContextClient;
// This is kept until startWorkerContext is called, and then passed on
// to WorkerContext.
- OwnPtr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
+ std::unique_ptr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
// We retain ownership of this one which is for use on the
// main thread only.
- OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
+ std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
// Kept around only while main script loading is ongoing.
RefPtr<WorkerScriptLoader> m_mainScriptLoader;
- OwnPtr<WorkerThread> m_workerThread;
+ std::unique_ptr<WorkerThread> m_workerThread;
RefPtr<WorkerLoaderProxy> m_loaderProxy;
Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
Persistent<WorkerInspectorProxy> m_workerInspectorProxy;

Powered by Google App Engine
This is Rietveld 408576698