third_party/WebKit/Source/modules/webdatabase/SQLStatement.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/SQLStatement.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/DatabaseTracker.cpp ('k') | third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 89b8347fb7d34dfc265cf5f3ca1a14f448b55732..95f379941c1b1de7ec3a8f839e90b6e87e87bc99 100644

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

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

@@ -56,7 +56,7 @@ SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback,

, m_asyncOperationId(0)

{

if (hasCallback() || hasErrorCallback())

- m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(database->executionContext(), "SQLStatement");

+ m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(database->getExecutionContext(), "SQLStatement");

}

SQLStatement::~SQLStatement()

@@ -96,7 +96,7 @@ bool SQLStatement::performCallback(SQLTransaction* transaction)

SQLStatementErrorCallback* errorCallback = m_statementErrorCallback.release();

SQLErrorData* error = m_backend->sqlError();

- InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(transaction->database()->executionContext(), m_asyncOperationId);

+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(transaction->database()->getExecutionContext(), m_asyncOperationId);

// Call the appropriate statement callback and track if it resulted in an error,

// because then we need to jump to the transaction error callback.