third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/SQLTransaction.cpp ('k') | third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.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 c385a788149d11bdb76d44f596e681c6a9359a73..24dd8750eb538fa8523f1631c99503acb5c78ba3 100644

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

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

@@ -381,7 +381,7 @@ void SQLTransactionBackend::doCleanup()

return;

m_frontend = nullptr; // Break the reference cycle. See comment about the life-cycle above.

- ASSERT(database()->databaseContext()->databaseThread()->isDatabaseThread());

+ ASSERT(database()->getDatabaseContext()->databaseThread()->isDatabaseThread());

MutexLocker locker(m_statementMutex);

m_statementQueue.clear();

@@ -525,7 +525,7 @@ void SQLTransactionBackend::executeSQL(SQLStatement* statement,

void SQLTransactionBackend::notifyDatabaseThreadIsShuttingDown()

{

- ASSERT(database()->databaseContext()->databaseThread()->isDatabaseThread());

+ ASSERT(database()->getDatabaseContext()->databaseThread()->isDatabaseThread());

// If the transaction is in progress, we should roll it back here, since this

// is our last opportunity to do something related to this transaction on the