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

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

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 197 matching lines @@
     , m_name(name.isolatedCopy())
     , m_expectedVersion(expectedVersion.isolatedCopy())
     , m_displayName(displayName.isolatedCopy())
     , m_estimatedSize(estimatedSize)
     , m_guid(0)
     , m_opened(0)
     , m_new(false)
     , m_transactionInProgress(false)
     , m_isTransactionQueueEnabled(true)
 {
-    m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
+    m_contextThreadSecurityOrigin = m_databaseContext->getSecurityOrigin()->isolatedCopy();
 
     m_databaseAuthorizer = DatabaseAuthorizer::create(infoTableName);
 
     if (m_name.isNull())
         m_name = "";
 
     {
         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());
     ASSERT(m_databaseContext->isContextThread());
 }
 
 Database::~Database()
 {
     // SQLite is "multi-thread safe", but each database handle can only be used
     // on a single thread at a time.
@@ skipping 11 matching lines @@
 {
     visitor->trace(m_databaseContext);
     visitor->trace(m_sqliteDatabase);
     visitor->trace(m_databaseAuthorizer);
     visitor->trace(m_transactionQueue);
 }
 
 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;
 }
 
 void Database::close()
 {
-    ASSERT(databaseContext()->databaseThread());
-    ASSERT(databaseContext()->databaseThread()->isDatabaseThread());
+    ASSERT(getDatabaseContext()->databaseThread());
+    ASSERT(getDatabaseContext()->databaseThread()->isDatabaseThread());
 
     {
         MutexLocker locker(m_transactionInProgressMutex);
 
         // Clean up transactions that have not been scheduled yet:
         // Transaction phase 1 cleanup. See comment on "What happens if a
         // transaction is interrupted?" at the top of SQLTransactionBackend.cpp.
         SQLTransactionBackend* transaction = nullptr;
         while (!m_transactionQueue.isEmpty()) {
             transaction = m_transactionQueue.takeFirst();
             transaction->notifyDatabaseThreadIsShuttingDown();
         }
 
         m_isTransactionQueueEnabled = false;
         m_transactionInProgress = false;
     }
 
     closeDatabase();
-    databaseContext()->databaseThread()->recordDatabaseClosed(this);
+    getDatabaseContext()->databaseThread()->recordDatabaseClosed(this);
 }
 
 SQLTransactionBackend* Database::runTransaction(SQLTransaction* transaction, bool readOnly, const ChangeVersionData* data)
 {
     MutexLocker locker(m_transactionInProgressMutex);
     if (!m_isTransactionQueueEnabled)
         return nullptr;
 
     SQLTransactionWrapper* wrapper = nullptr;
     if (data)
@@ skipping 15 matching lines @@
 }
 
 void Database::scheduleTransaction()
 {
     ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
     SQLTransactionBackend* transaction = nullptr;
 
     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;
     }
 }
 
 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
 const char* Database::databaseInfoTableName()
 {
     return infoTableName;
 }
 
 void Database::closeDatabase()
 {
@@ skipping 168 matching lines @@
     onExitCaller.setOpenSucceeded();
 
     if (m_new && !shouldSetVersionInNewDatabase) {
         // The caller provided a creationCallback which will set the expected
         // version.
         m_expectedVersion = "";
     }
 
     reportOpenDatabaseResult(0, -1, 0, WTF::monotonicallyIncreasingTime() - callStartTime); // OK
 
-    if (databaseContext()->databaseThread())
-        databaseContext()->databaseThread()->recordDatabaseOpen(this);
+    if (getDatabaseContext()->databaseThread())
+        getDatabaseContext()->databaseThread()->recordDatabaseOpen(this);
     return true;
 }
 
 String Database::stringIdentifier() const
 {
     // Return a deep copy for ref counting thread safety
     return m_name.isolatedCopy();
 }
 
 String Database::displayName() const
@@ skipping 144 matching lines @@
             logErrorMessage(formatErrorMessage("error vacuuming database", result, m_sqliteDatabase.lastErrorMsg()));
     }
 }
 
 // These are used to generate histograms of errors seen with websql.
 // See about:histograms in chromium.
 void Database::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode, double duration)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportOpenDatabaseResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode,
             duration);
     }
 }
 
 void Database::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportChangeVersionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
 
 void Database::reportStartTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportStartTransactionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
 
 void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportCommitTransactionResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
 
 void Database::reportExecuteStatementResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     if (Platform::current()->databaseObserver()) {
         Platform::current()->databaseObserver()->reportExecuteStatementResult(
-            createDatabaseIdentifierFromSecurityOrigin(securityOrigin()),
+            createDatabaseIdentifierFromSecurityOrigin(getSecurityOrigin()),
             stringIdentifier(), errorSite, webSqlErrorCode, sqliteErrorCode);
     }
 }
 
 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));
     }
 }
 
 void Database::changeVersion(
     const String& oldVersion,
     const String& newVersion,
     SQLTransactionCallback* callback,
     SQLTransactionErrorCallback* errorCallback,
     VoidCallback* successCallback)
 {
@@ skipping 22 matching lines @@
     callback->handleEvent(SQLError::create(*errorData));
 }
 
 void Database::runTransaction(
     SQLTransactionCallback* callback,
     SQLTransactionErrorCallback* errorCallback,
     VoidCallback* successCallback,
     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
     // actually going to run it.
 #if ENABLE(ASSERT)
     SQLTransactionErrorCallback* originalErrorCallback = errorCallback;
 #endif
     SQLTransaction* transaction = SQLTransaction::create(this, callback, successCallback, errorCallback, readOnly);
     SQLTransactionBackend* transactionBackend = runTransaction(transaction, readOnly, changeVersionData);
     if (!transactionBackend) {
         SQLTransactionErrorCallback* callback = transaction->releaseErrorCallback();
         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()));
         }
     }
 }
 
 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()
 {
     disableAuthorizer();
 
     SQLiteStatement statement(sqliteDatabase(), "SELECT name FROM sqlite_master WHERE type='table';");
     if (statement.prepare() != SQLResultOk) {
         WTF_LOG_ERROR("Unable to retrieve list of tables for database %s", databaseDebugName().ascii().data());
         enableAuthorizer();
@@ skipping 18 matching lines @@
     return tableNames;
 }
 
 Vector<String> Database::tableNames()
 {
     // FIXME: Not using isolatedCopy on these strings looks ok since threads
     // take strict turns in dealing with them. However, if the code changes,
     // 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;
 }
 
 bool Database::opened()
 {
     return static_cast<bool>(acquireLoad(&m_opened));
 }
 
 } // namespace blink