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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 614f4e19face281094066d9e242ba81dcf3a50c2..1997bc88c2b4345eb90862d7e82a80e28f2d8c5e 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
@@ -38,7 +38,6 @@
#include "public/web/WebEmbeddedWorker.h"
#include "public/web/WebEmbeddedWorkerStartData.h"
#include "public/web/WebFrameClient.h"
-#include <memory>
namespace blink {
@@ -57,7 +56,7 @@ class WebEmbeddedWorkerImpl final
, private WorkerLoaderProxyProvider {
WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl);
public:
- WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient>, std::unique_ptr<WebWorkerContentSettingsClientProxy>);
+ WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient>, PassOwnPtr<WebWorkerContentSettingsClientProxy>);
~WebEmbeddedWorkerImpl() override;
// WebEmbeddedWorker overrides.
@@ -96,20 +95,20 @@ private:
WebEmbeddedWorkerStartData m_workerStartData;
- std::unique_ptr<WebServiceWorkerContextClient> m_workerContextClient;
+ OwnPtr<WebServiceWorkerContextClient> m_workerContextClient;
// This is kept until startWorkerContext is called, and then passed on
// to WorkerContext.
- std::unique_ptr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
+ OwnPtr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
// We retain ownership of this one which is for use on the
// main thread only.
- std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
+ OwnPtr<WebServiceWorkerNetworkProvider> m_networkProvider;
// Kept around only while main script loading is ongoing.
RefPtr<WorkerScriptLoader> m_mainScriptLoader;
- std::unique_ptr<WorkerThread> m_workerThread;
+ OwnPtr<WorkerThread> m_workerThread;
RefPtr<WorkerLoaderProxy> m_loaderProxy;
Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
« no previous file with comments | « third_party/WebKit/Source/web/WebElementTest.cpp ('k') | third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698