Index: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp |
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp |
index ce8ba0c1771dce364113b74b6406cafc48c07fca..9be4f6b841f3de036df3f91fb97889ee27c4c58d 100644 |
--- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp |
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp |
@@ -33,6 +33,7 @@ |
#include "modules/indexeddb/IDBDatabaseCallbacks.h" |
#include "modules/indexeddb/IDBTracing.h" |
#include "modules/indexeddb/IDBVersionChangeEvent.h" |
+#include <memory> |
using blink::WebIDBDatabase; |
@@ -78,11 +79,11 @@ void IDBOpenDBRequest::onBlocked(int64_t oldVersion) |
enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::blocked, oldVersion, newVersionNullable)); |
} |
-void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage) |
+void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage) |
{ |
IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()"); |
if (m_contextStopped || !getExecutionContext()) { |
- OwnPtr<WebIDBDatabase> db = std::move(backend); |
+ std::unique_ptr<WebIDBDatabase> db = std::move(backend); |
db->abort(m_transactionId); |
db->close(); |
return; |
@@ -110,11 +111,11 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBData |
enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage)); |
} |
-void IDBOpenDBRequest::onSuccess(PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata) |
+void IDBOpenDBRequest::onSuccess(std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata) |
{ |
IDB_TRACE("IDBOpenDBRequest::onSuccess()"); |
if (m_contextStopped || !getExecutionContext()) { |
- OwnPtr<WebIDBDatabase> db = std::move(backend); |
+ std::unique_ptr<WebIDBDatabase> db = std::move(backend); |
if (db) |
db->close(); |
return; |