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

Unified Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseThread.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/modules/webdatabase/DatabaseThread.h
diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseThread.h b/third_party/WebKit/Source/modules/webdatabase/DatabaseThread.h
index 26355298396228021d4869de283107c749eac280..afe5454f87ee74375af9c1426bf0d37b67fc05e0 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DatabaseThread.h
+++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseThread.h
@@ -31,9 +31,8 @@
#include "platform/WebThreadSupportingGC.h"
#include "platform/heap/Handle.h"
#include "wtf/HashMap.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
#include "wtf/ThreadingPrimitives.h"
+#include <memory>
namespace blink {
@@ -54,7 +53,7 @@ public:
void terminate();
// Callable from the main thread or the database thread.
- void scheduleTask(PassOwnPtr<DatabaseTask>);
+ void scheduleTask(std::unique_ptr<DatabaseTask>);
bool isDatabaseThread() const;
// Callable only from the database thread.
@@ -72,14 +71,14 @@ private:
void cleanupDatabaseThread();
void cleanupDatabaseThreadCompleted();
- OwnPtr<WebThreadSupportingGC> m_thread;
+ std::unique_ptr<WebThreadSupportingGC> m_thread;
// This set keeps track of the open databases that have been used on this thread.
// This must be updated in the database thread though it is constructed and
// destructed in the context thread.
HashSet<CrossThreadPersistent<Database>> m_openDatabaseSet;
- OwnPtr<SQLTransactionClient> m_transactionClient;
+ std::unique_ptr<SQLTransactionClient> m_transactionClient;
CrossThreadPersistent<SQLTransactionCoordinator> m_transactionCoordinator;
TaskSynchronizer* m_cleanupSync;

Powered by Google App Engine
This is Rietveld 408576698