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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerGlobalScope.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/core/workers/WorkerGlobalScope.h
diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
index 1117ef4c8c7d0f3b5b1735b5c91d3c06861d4734..ff21f438df06db5f2210af770e2dc7c874b297e2 100644
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
@@ -45,10 +45,10 @@
#include "wtf/Assertions.h"
#include "wtf/HashMap.h"
#include "wtf/ListHashSet.h"
+#include "wtf/OwnPtr.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefPtr.h"
#include "wtf/text/AtomicStringHash.h"
-#include <memory>
namespace blink {
@@ -141,7 +141,7 @@ public:
void addConsoleMessage(ConsoleMessage*) final;
ConsoleMessageStorage* messageStorage();
- void exceptionUnhandled(const String& errorMessage, std::unique_ptr<SourceLocation>);
+ void exceptionUnhandled(const String& errorMessage, PassOwnPtr<SourceLocation>);
virtual void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) { }
@@ -153,10 +153,10 @@ public:
DECLARE_VIRTUAL_TRACE();
protected:
- WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData>, WorkerClients*);
+ WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData>, WorkerClients*);
void applyContentSecurityPolicyFromVector(const Vector<CSPHeaderAndType>& headers);
- void logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation>) override;
+ void logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation>) override;
void addMessageToWorkerConsole(ConsoleMessage*);
void setV8CacheOptions(V8CacheOptions v8CacheOptions) { m_v8CacheOptions = v8CacheOptions; }

Powered by Google App Engine
This is Rietveld 408576698