Rename IDBDatabaseIdentifier::debugString to IDBDatabaseIdentifier::loggingString
https://bugs.webkit.org/show_bug.cgi?id=204898
Reviewed by Brady Eidson.
We use loggingString everywhere in IDB code but IDBDatabaseIdentifier, so rename it for consistency.
No behavior change.
* Modules/indexeddb/IDBDatabaseIdentifier.cpp:
(WebCore::IDBDatabaseIdentifier::loggingString const):
(WebCore::IDBDatabaseIdentifier::debugString const): Deleted.
* Modules/indexeddb/IDBDatabaseIdentifier.h:
* Modules/indexeddb/client/IDBConnectionToServer.cpp:
(WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
(WebCore::IDBClient::IDBConnectionToServer::openDatabase):
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::deleteDatabase):
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::~UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
(WebCore::IDBServer::UniqueIDBDatabase::deleteBackingStore):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@253174 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ec42305..ea286fe 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2019-12-05 Sihui Liu <sihui_liu@apple.com>
+
+ Rename IDBDatabaseIdentifier::debugString to IDBDatabaseIdentifier::loggingString
+ https://bugs.webkit.org/show_bug.cgi?id=204898
+
+ Reviewed by Brady Eidson.
+
+ We use loggingString everywhere in IDB code but IDBDatabaseIdentifier, so rename it for consistency.
+
+ No behavior change.
+
+ * Modules/indexeddb/IDBDatabaseIdentifier.cpp:
+ (WebCore::IDBDatabaseIdentifier::loggingString const):
+ (WebCore::IDBDatabaseIdentifier::debugString const): Deleted.
+ * Modules/indexeddb/IDBDatabaseIdentifier.h:
+ * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+ (WebCore::IDBClient::IDBConnectionToServer::deleteDatabase):
+ (WebCore::IDBClient::IDBConnectionToServer::openDatabase):
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::deleteDatabase):
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::~UniqueIDBDatabase):
+ (WebCore::IDBServer::UniqueIDBDatabase::performCurrentDeleteOperation):
+ (WebCore::IDBServer::UniqueIDBDatabase::deleteBackingStore):
+
2019-12-05 Zalan Bujtas <zalan@apple.com>
[LFC][IFC] Introduce InlineSoftLineBreakItem
diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp b/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp
index 4f26d32..555b0c1 100644
--- a/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp
+++ b/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.cpp
@@ -71,7 +71,7 @@
}
#if !LOG_DISABLED
-String IDBDatabaseIdentifier::debugString() const
+String IDBDatabaseIdentifier::loggingString() const
{
return makeString(m_databaseName, "@", m_origin.topOrigin.debugString(), ":", m_origin.clientOrigin.debugString());
}
diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h b/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h
index 7bf8f9a..3a8e219 100644
--- a/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h
+++ b/Source/WebCore/Modules/indexeddb/IDBDatabaseIdentifier.h
@@ -88,7 +88,7 @@
template<class Decoder> static Optional<IDBDatabaseIdentifier> decode(Decoder&);
#if !LOG_DISABLED
- String debugString() const;
+ String loggingString() const;
#endif
bool isRelatedToOrigin(const SecurityOriginData& other) const { return m_origin.isRelated(other); }
diff --git a/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp b/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp
index 7570616..0e45b43 100644
--- a/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp
+++ b/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp
@@ -74,7 +74,7 @@
void IDBConnectionToServer::deleteDatabase(const IDBRequestData& request)
{
- LOG(IndexedDB, "IDBConnectionToServer::deleteDatabase - %s", request.databaseIdentifier().debugString().utf8().data());
+ LOG(IndexedDB, "IDBConnectionToServer::deleteDatabase - %s", request.databaseIdentifier().loggingString().utf8().data());
if (m_serverConnectionIsValid)
m_delegate->deleteDatabase(request);
@@ -90,7 +90,7 @@
void IDBConnectionToServer::openDatabase(const IDBRequestData& request)
{
- LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%s) (%" PRIu64 ")", request.databaseIdentifier().debugString().utf8().data(), request.requestIdentifier().loggingString().utf8().data(), request.requestedVersion());
+ LOG(IndexedDB, "IDBConnectionToServer::openDatabase - %s (%s) (%" PRIu64 ")", request.databaseIdentifier().loggingString().utf8().data(), request.requestIdentifier().loggingString().utf8().data(), request.requestedVersion());
if (m_serverConnectionIsValid)
m_delegate->openDatabase(request);
diff --git a/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp b/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp
index bba6623..8f9cc54 100644
--- a/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp
+++ b/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp
@@ -155,7 +155,7 @@
void IDBServer::deleteDatabase(const IDBRequestData& requestData)
{
- LOG(IndexedDB, "IDBServer::deleteDatabase - %s", requestData.databaseIdentifier().debugString().utf8().data());
+ LOG(IndexedDB, "IDBServer::deleteDatabase - %s", requestData.databaseIdentifier().loggingString().utf8().data());
ASSERT(isMainThread());
auto connection = m_connectionMap.get(requestData.requestIdentifier().connectionIdentifier());
diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
index ff8ad8a..039ba8c 100644
--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
@@ -123,12 +123,12 @@
, m_operationAndTransactionTimer(*this, &UniqueIDBDatabase::operationAndTransactionTimerFired)
{
m_server->addDatabase(*this);
- LOG(IndexedDB, "UniqueIDBDatabase::UniqueIDBDatabase() (%p) %s", this, m_identifier.debugString().utf8().data());
+ LOG(IndexedDB, "UniqueIDBDatabase::UniqueIDBDatabase() (%p) %s", this, m_identifier.loggingString().utf8().data());
}
UniqueIDBDatabase::~UniqueIDBDatabase()
{
- LOG(IndexedDB, "UniqueIDBDatabase::~UniqueIDBDatabase() (%p) %s", this, m_identifier.debugString().utf8().data());
+ LOG(IndexedDB, "UniqueIDBDatabase::~UniqueIDBDatabase() (%p) %s", this, m_identifier.loggingString().utf8().data());
ASSERT(isMainThread());
ASSERT(!hasAnyPendingCallbacks());
ASSERT(!hasUnfinishedTransactions());
@@ -267,7 +267,7 @@
void UniqueIDBDatabase::performCurrentDeleteOperation()
{
ASSERT(isMainThread());
- LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation - %s", m_identifier.debugString().utf8().data());
+ LOG(IndexedDB, "(main) UniqueIDBDatabase::performCurrentDeleteOperation - %s", m_identifier.loggingString().utf8().data());
ASSERT(m_currentOpenDBRequest);
ASSERT(m_currentOpenDBRequest->isDeleteRequest());
@@ -321,7 +321,7 @@
IDBDatabaseInfo databaseInfo;
auto error = backingStore->getOrEstablishDatabaseInfo(databaseInfo, locker);
if (!error.isNull())
- LOG_ERROR("Error getting database info from database %s that we are trying to delete", identifier.debugString().utf8().data());
+ LOG_ERROR("Error getting database info from database %s that we are trying to delete", identifier.loggingString().utf8().data());
deletedVersion = databaseInfo.version();
backingStore->deleteBackingStore(locker);
