blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/Source/modules/webdatabase/Database.cpp

Index: third_party/WebKit/Source/modules/webdatabase/Database.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/Database.cpp b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
index 545f8bce84dc5377b67feaa0ca2dfbc3c8e1800a..32b524b370a84d4dc98121a9bee10bf021f930b1 100644
--- a/third_party/WebKit/Source/modules/webdatabase/Database.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
@@ -215,7 +215,7 @@ Database::Database(DatabaseContext* databaseContext, const String& name, const S
     , m_transactionInProgress(false)
     , m_isTransactionQueueEnabled(true)
 {
-    m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
+    m_contextThreadSecurityOrigin = m_databaseContext->getSecurityOrigin()->isolatedCopy();
 
     m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
 
@@ -224,11 +224,11 @@ Database::Database(DatabaseContext* databaseContext, const String& name, const S
 
     {
         SafePointAwareMutexLocker locker(guidMutex());
-        m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
+        m_guid = guidForOriginAndName(getSecurityOrigin()->toString(), name);
         guidCount().add(m_guid);
     }
 
-    m_filename = DatabaseManager::manager().fullPathForDatabase(securityOrigin(), m_name);
+    m_filename = DatabaseManager::manager().fullPathForDatabase(getSecurityOrigin(), m_name);
 
     m_databaseThreadSecurityOrigin = m_contextThreadSecurityOrigin->isolatedCopy();
     ASSERT(m_databaseContext->databaseThread());
@@ -260,13 +260,13 @@ DEFINE_TRACE(Database)
 bool Database::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
 {
     TaskSynchronizer synchronizer;
-    if (!databaseContext()->databaseThreadAvailable())
+    if (!getDatabaseContext()->databaseThreadAvailable())
         return false;
 
     DatabaseTracker::tracker().prepareToOpenDatabase(this);
     bool success = false;
     OwnPtr<DatabaseOpenTask> task = DatabaseOpenTask::create(this, setVersionInNewDatabase, &synchronizer, error, errorMessage, success);
-    databaseContext()->databaseThread()->scheduleTask(task.release());
+    getDatabaseContext()->databaseThread()->scheduleTask(task.release());
     synchronizer.waitForTaskCompletion();
 
     return success;
@@ -274,8 +274,8 @@ bool Database::openAndVerifyVersion(bool setVersionInNewDatabase, DatabaseError&
 
 void Database::close()
 {
-    ASSERT(databaseContext()->databaseThread());
-    ASSERT(databaseContext()->databaseThread()->isDatabaseThread());
+    ASSERT(getDatabaseContext()->databaseThread());
+    ASSERT(getDatabaseContext()->databaseThread()->isDatabaseThread());
 
     {
         MutexLocker locker(m_transactionInProgressMutex);
@@ -294,7 +294,7 @@ void Database::close()
     }
 
     closeDatabase();
-    databaseContext()->databaseThread()->recordDatabaseClosed(this);
+    getDatabaseContext()->databaseThread()->recordDatabaseClosed(this);
 }
 
 SQLTransactionBackend* Database::runTransaction(SQLTransaction* transaction, bool readOnly, const ChangeVersionData* data)
@@ -330,11 +330,11 @@ void Database::scheduleTransaction()
     if (m_isTransactionQueueEnabled && !m_transactionQueue.isEmpty())
         transaction = m_transactionQueue.takeFirst();
 
-    if (transaction && databaseContext()->databaseThreadAvailable()) {
+    if (transaction && getDatabaseContext()->databaseThreadAvailable()) {
         OwnPtr<DatabaseTransactionTask> task = DatabaseTransactionTask::create(transaction);
         WTF_LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for transaction %p\n", task.get(), task->transaction());
         m_transactionInProgress = true;
-        databaseContext()->databaseThread()->scheduleTask(task.release());
+        getDatabaseContext()->databaseThread()->scheduleTask(task.release());
     } else {
         m_transactionInProgress = false;
     }
@@ -342,22 +342,22 @@ void Database::scheduleTransaction()
 
 void Database::scheduleTransactionStep(SQLTransactionBackend* transaction)
 {
-    if (!databaseContext()->databaseThreadAvailable())
+    if (!getDatabaseContext()->databaseThreadAvailable())
         return;
 
     OwnPtr<DatabaseTransactionTask> task = DatabaseTransactionTask::create(transaction);
     WTF_LOG(StorageAPI, "Scheduling DatabaseTransactionTask %p for the transaction step\n", task.get());
-    databaseContext()->databaseThread()->scheduleTask(task.release());
+    getDatabaseContext()->databaseThread()->scheduleTask(task.release());
 }
 
 SQLTransactionClient* Database::transactionClient() const
 {
-    return databaseContext()->databaseThread()->transactionClient();
+    return getDatabaseContext()->databaseThread()->transactionClient();
 }
 
 SQLTransactionCoordinator* Database::transactionCoordinator() const
 {
-    return databaseContext()->databaseThread()->transactionCoordinator();
+    return getDatabaseContext()->databaseThread()->transactionCoordinator();
 }
 
 // static
@@ -546,8 +546,8 @@ bool Database::performOpenAndVerify(bool shouldSetVersionInNewDatabase, Database
 
     reportOpenDatabaseResult(0, -1, 0, WTF::monotonicallyIncreasingTime() - callStartTime); // OK
 
-    if (databaseContext()->databaseThread())
-        databaseContext()->databaseThread()->recordDatabaseOpen(this);
+    if (getDatabaseContext()->databaseThread())
+        getDatabaseContext()->databaseThread()->recordDatabaseOpen(this);
     return true;
 }
 
@@ -712,7 +712,7 @@ void Database::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportOpenDatabaseResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode,
             duration);
     }
@@ -722,7 +722,7 @@ void Database::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportChangeVersionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
@@ -731,7 +731,7 @@ void Database::reportStartTransactionResult(int errorSite, int webSqlErrorCode,
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportStartTransactionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
@@ -740,7 +740,7 @@ void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode,
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportCommitTransactionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
@@ -749,7 +749,7 @@ void Database::reportExecuteStatementResult(int errorSite, int webSqlErrorCode,
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportExecuteStatementResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
@@ -758,27 +758,27 @@ void Database::reportVacuumDatabaseResult(int sqliteErrorCode)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportVacuumDatabaseResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), sqliteErrorCode);
     }
 }
 
 void Database::logErrorMessage(const String& message)
 {
-    executionContext()->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
+    getExecutionContext()->addConsoleMessage(ConsoleMessage::create(StorageMessageSource, ErrorMessageLevel, message));
 }
 
-ExecutionContext* Database::executionContext() const
+ExecutionContext* Database::getExecutionContext() const
 {
-    return databaseContext()->executionContext();
+    return getDatabaseContext()->getExecutionContext();
 }
 
 void Database::closeImmediately()
 {
-    ASSERT(executionContext()->isContextThread());
-    if (databaseContext()->databaseThreadAvailable() && opened()) {
+    ASSERT(getExecutionContext()->isContextThread());
+    if (getDatabaseContext()->databaseThreadAvailable() && opened()) {
         logErrorMessage("forcibly closing database");
-        databaseContext()->databaseThread()->scheduleTask(DatabaseCloseTask::create(this, 0));
+        getDatabaseContext()->databaseThread()->scheduleTask(DatabaseCloseTask::create(this, 0));
     }
 }
 
@@ -821,7 +821,7 @@ void Database::runTransaction(
     bool readOnly,
     const ChangeVersionData* changeVersionData)
 {
-    ASSERT(executionContext()->isContextThread());
+    ASSERT(getExecutionContext()->isContextThread());
     // FIXME: Rather than passing errorCallback to SQLTransaction and then
     // sometimes firing it ourselves, this code should probably be pushed down
     // into Database so that we only create the SQLTransaction if we're
@@ -836,7 +836,7 @@ void Database::runTransaction(
         ASSERT(callback == originalErrorCallback);
         if (callback) {
             OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_ERR, "database has been closed");
-            executionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&callTransactionErrorCallback, callback, error.release()));
+            getExecutionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&callTransactionErrorCallback, callback, error.release()));
         }
     }
 }
@@ -845,7 +845,7 @@ void Database::scheduleTransactionCallback(SQLTransaction* transaction)
 {
     // The task is constructed in a database thread, and destructed in the
     // context thread.
-    executionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&SQLTransaction::performPendingCallback, transaction));
+    getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&SQLTransaction::performPendingCallback, transaction));
 }
 
 Vector<String> Database::performGetTableNames()
@@ -884,21 +884,21 @@ Vector<String> Database::tableNames()
     // this may not be true anymore.
     Vector<String> result;
     TaskSynchronizer synchronizer;
-    if (!databaseContext()->databaseThreadAvailable())
+    if (!getDatabaseContext()->databaseThreadAvailable())
         return result;
 
     OwnPtr<DatabaseTableNamesTask> task = DatabaseTableNamesTask::create(this, &synchronizer, result);
-    databaseContext()->databaseThread()->scheduleTask(task.release());
+    getDatabaseContext()->databaseThread()->scheduleTask(task.release());
     synchronizer.waitForTaskCompletion();
 
     return result;
 }
 
-SecurityOrigin* Database::securityOrigin() const
+SecurityOrigin* Database::getSecurityOrigin() const
 {
-    if (executionContext()->isContextThread())
+    if (getExecutionContext()->isContextThread())
         return m_contextThreadSecurityOrigin.get();
-    if (databaseContext()->databaseThread()->isDatabaseThread())
+    if (getDatabaseContext()->databaseThread()->isDatabaseThread())
         return m_databaseThreadSecurityOrigin.get();
     return 0;
 }