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

Unified Diff: third_party/WebKit/Source/core/dom/ExecutionContext.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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/dom/ExecutionContext.h
diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.h b/third_party/WebKit/Source/core/dom/ExecutionContext.h
index cd3c1fe93896af16e8f12a9ed7f2794a38f6e986..92d1d2cee9784f52754307836b2de871e1bd2549 100644
--- a/third_party/WebKit/Source/core/dom/ExecutionContext.h
+++ b/third_party/WebKit/Source/core/dom/ExecutionContext.h
@@ -40,8 +40,7 @@
#include "platform/weborigin/ReferrerPolicy.h"
#include "wtf/Deque.h"
#include "wtf/Noncopyable.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
+#include <memory>
namespace blink {
@@ -108,7 +107,7 @@ public:
void reportException(ErrorEvent*, AccessControlStatus);
virtual void addConsoleMessage(ConsoleMessage*) = 0;
- virtual void logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation>) = 0;
+ virtual void logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation>) = 0;
PublicURLManager& publicURLManager();
@@ -117,7 +116,7 @@ public:
void suspendActiveDOMObjects();
void resumeActiveDOMObjects();
void stopActiveDOMObjects();
- void postSuspendableTask(PassOwnPtr<SuspendableTask>);
+ void postSuspendableTask(std::unique_ptr<SuspendableTask>);
void notifyContextDestroyed() override;
virtual void suspendScheduledTasks();
@@ -168,7 +167,7 @@ private:
bool m_inDispatchErrorEvent;
class PendingException;
- OwnPtr<Vector<OwnPtr<PendingException>>> m_pendingExceptions;
+ std::unique_ptr<Vector<std::unique_ptr<PendingException>>> m_pendingExceptions;
bool m_activeDOMObjectsAreSuspended;
bool m_activeDOMObjectsAreStopped;
@@ -181,7 +180,7 @@ private:
// increment and decrement the counter.
int m_windowInteractionTokens;
- Deque<OwnPtr<SuspendableTask>> m_suspendedTasks;
+ Deque<std::unique_ptr<SuspendableTask>> m_suspendedTasks;
bool m_isRunSuspendableTasksScheduled;
ReferrerPolicy m_referrerPolicy;
« no previous file with comments | « third_party/WebKit/Source/core/dom/ElementTest.cpp ('k') | third_party/WebKit/Source/core/dom/ExecutionContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698