Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: third_party/WebKit/Source/modules/webdatabase/DatabaseManager.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
Index: third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
index 060dfc515eb5bd610645cfb1ce8f456a002af07b..282b43c6cba7249f8122a1fb1f734ee8c02b4e40 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseManager.cpp
@@ -120,7 +120,7 @@ DatabaseContext* DatabaseManager::databaseContextFor(ExecutionContext* context)
void DatabaseManager::registerDatabaseContext(DatabaseContext* databaseContext)
{
- ExecutionContext* context = databaseContext->executionContext();
+ ExecutionContext* context = databaseContext->getExecutionContext();
m_contextMap.set(context, databaseContext);
#if ENABLE(ASSERT)
m_databaseContextRegisteredCount++;
@@ -129,7 +129,7 @@ void DatabaseManager::registerDatabaseContext(DatabaseContext* databaseContext)
void DatabaseManager::unregisterDatabaseContext(DatabaseContext* databaseContext)
{
- ExecutionContext* context = databaseContext->executionContext();
+ ExecutionContext* context = databaseContext->getExecutionContext();
ASSERT(m_contextMap.get(context));
#if ENABLE(ASSERT)
m_databaseContextRegisteredCount--;
@@ -169,7 +169,7 @@ void DatabaseManager::throwExceptionForDatabaseError(DatabaseError error, const
static void logOpenDatabaseError(ExecutionContext* context, const String& name)
{
WTF_LOG(StorageAPI, "Database %s for origin %s not allowed to be established", name.ascii().data(),
- context->securityOrigin()->toString().ascii().data());
+ context->getSecurityOrigin()->toString().ascii().data());
}
Database* DatabaseManager::openDatabaseInternal(ExecutionContext* context,
@@ -215,11 +215,11 @@ Database* DatabaseManager::openDatabase(ExecutionContext* context,
return nullptr;
databaseContextFor(context)->setHasOpenDatabases();
- DatabaseClient::from(context)->didOpenDatabase(database, context->securityOrigin()->host(), name, expectedVersion);
+ DatabaseClient::from(context)->didOpenDatabase(database, context->getSecurityOrigin()->host(), name, expectedVersion);
if (database->isNew() && creationCallback) {
WTF_LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database);
- database->executionContext()->postTask(BLINK_FROM_HERE, DatabaseCreationCallbackTask::create(database, creationCallback));
+ database->getExecutionContext()->postTask(BLINK_FROM_HERE, DatabaseCreationCallbackTask::create(database, creationCallback));
}
ASSERT(database);

Powered by Google App Engine
This is Rietveld 408576698