third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp - Issue 2050123002: Remove OwnPtr from Blink.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

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

« no previous file with comments | « third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h ('k') | third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteStatement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

index d1f589f8623c34ca7faacb7bc25cd7454ebd56c0..8a4f350c12c1f8ef126f295d99baba3fdcaf938a 100644

--- a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

+++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

@@ -41,7 +41,9 @@

#include "modules/webdatabase/sqlite/SQLValue.h"

#include "modules/webdatabase/sqlite/SQLiteTransaction.h"

#include "platform/Logging.h"

+#include "wtf/PtrUtil.h"

#include "wtf/StdLibExtras.h"

+#include <memory>

// How does a SQLTransaction work?

@@ -253,7 +255,7 @@

// When executing the transaction (in DatabaseThread::databaseThread()):

// ====================================================================

-// OwnPtr<DatabaseTask> task; // points to ...

+// std::unique_ptr<DatabaseTask> task; // points to ...

// --> DatabaseTransactionTask // Member<SQLTransactionBackend> m_transaction points to ...

// --> SQLTransactionBackend // Member<SQLTransaction> m_frontend;

// --> SQLTransaction // Member<SQLTransactionBackend> m_backend points to ...

@@ -277,7 +279,7 @@

// However, there will still be a DatabaseTask pointing to the SQLTransactionBackend (see

// the "When executing the transaction" chain above). This will keep the

// SQLTransactionBackend alive until DatabaseThread::databaseThread() releases its

-// task OwnPtr.

+// task std::unique_ptr.

// What happens if a transaction is interrupted?

// ============================================

@@ -561,7 +563,7 @@ SQLTransactionState SQLTransactionBackend::openTransactionAndPreflight()

m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize());

ASSERT(!m_sqliteTransaction);

- m_sqliteTransaction = adoptPtr(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));

+ m_sqliteTransaction = wrapUnique(new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));

m_database->resetDeletes();

m_database->disableAuthorizer();