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

Unified Diff: Source/WebCore/loader/icon/IconDatabase.cpp

Issue 13643002: Rename LOG() to LOG_INFO() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: rebase Created 7 years, 8 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 | « Source/WebCore/loader/icon/IconController.cpp ('k') | Source/WebCore/loader/icon/IconLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/icon/IconDatabase.cpp
diff --git a/Source/WebCore/loader/icon/IconDatabase.cpp b/Source/WebCore/loader/icon/IconDatabase.cpp
index 3cb139600b1350a4c73dff4041b155b96f87ca40..24f6d96ca478726a1b40d8707a12106b18e2c6e9 100644
--- a/Source/WebCore/loader/icon/IconDatabase.cpp
+++ b/Source/WebCore/loader/icon/IconDatabase.cpp
@@ -181,7 +181,7 @@ void IconDatabase::removeAllIcons()
if (!isOpen())
return;
- LOG(IconDatabase, "Requesting background thread to remove all icons");
+ LOG_INFO(IconDatabase, "Requesting background thread to remove all icons");
// Clear the in-memory record of every IconRecord, anything waiting to be read from disk, and anything waiting to be written to disk
{
@@ -453,7 +453,7 @@ void IconDatabase::performRetainIconForPageURL(const String& pageURLOriginal, in
// If this pageURL waiting to be sync'ed, update the sync record
// This saves us in the case where a page was ready to be deleted from the database but was just retained - so theres no need to delete it!
if (!m_privateBrowsingEnabled && m_pageURLsPendingSync.contains(pageURL)) {
- LOG(IconDatabase, "Bringing %s back from the brink", pageURL.ascii().data());
+ LOG_INFO(IconDatabase, "Bringing %s back from the brink", pageURL.ascii().data());
m_pageURLsPendingSync.set(pageURL, record->snapshot());
}
}
@@ -487,7 +487,7 @@ void IconDatabase::performReleaseIconForPageURL(const String& pageURLOriginal, i
// Get its retain count - if it's retained, we'd better have a PageURLRecord for it
PageURLRecord* pageRecord = m_pageURLToRecordMap.get(pageURLOriginal);
ASSERT(pageRecord);
- LOG(IconDatabase, "Releasing pageURL %s to a retain count of %i", urlForLogging(pageURLOriginal).ascii().data(), pageRecord->retainCount() - 1);
+ LOG_INFO(IconDatabase, "Releasing pageURL %s to a retain count of %i", urlForLogging(pageURLOriginal).ascii().data(), pageRecord->retainCount() - 1);
ASSERT(pageRecord->retainCount() > 0);
// If it still has a positive retain count, store the new count and bail
@@ -495,7 +495,7 @@ void IconDatabase::performReleaseIconForPageURL(const String& pageURLOriginal, i
return;
// This pageRecord has now been fully released. Do the appropriate cleanup
- LOG(IconDatabase, "No more retainers for PageURL %s", urlForLogging(pageURLOriginal).ascii().data());
+ LOG_INFO(IconDatabase, "No more retainers for PageURL %s", urlForLogging(pageURLOriginal).ascii().data());
m_pageURLToRecordMap.remove(pageURLOriginal);
m_retainedPageURLs.remove(pageURLOriginal);
@@ -574,7 +574,7 @@ void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> dataOriginal,
if (icon->hasOneRef()) {
ASSERT(icon->retainingPageURLs().isEmpty());
- LOG(IconDatabase, "Icon for icon url %s is about to be destroyed - removing mapping for it", urlForLogging(icon->iconURL()).ascii().data());
+ LOG_INFO(IconDatabase, "Icon for icon url %s is about to be destroyed - removing mapping for it", urlForLogging(icon->iconURL()).ascii().data());
m_iconURLToRecordMap.remove(icon->iconURL());
}
}
@@ -591,7 +591,7 @@ void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> dataOriginal,
AutodrainedPool pool(25);
for (unsigned i = 0; i < pageURLs.size(); ++i) {
- LOG(IconDatabase, "Dispatching notification that retaining pageURL %s has a new icon", urlForLogging(pageURLs[i]).ascii().data());
+ LOG_INFO(IconDatabase, "Dispatching notification that retaining pageURL %s has a new icon", urlForLogging(pageURLs[i]).ascii().data());
m_client->didChangeIconForPageURL(pageURLs[i]);
pool.cycle();
@@ -639,7 +639,7 @@ void IconDatabase::setIconURLForPageURL(const String& iconURLOriginal, const Str
// Remove it from the in-memory records and don't bother reading it in from disk anymore
if (iconRecord && iconRecord->hasOneRef()) {
ASSERT(iconRecord->retainingPageURLs().size() == 0);
- LOG(IconDatabase, "Icon for icon url %s is about to be destroyed - removing mapping for it", urlForLogging(iconRecord->iconURL()).ascii().data());
+ LOG_INFO(IconDatabase, "Icon for icon url %s is about to be destroyed - removing mapping for it", urlForLogging(iconRecord->iconURL()).ascii().data());
m_iconURLToRecordMap.remove(iconRecord->iconURL());
MutexLocker locker(m_pendingReadingLock);
m_iconsPendingReading.remove(iconRecord.get());
@@ -662,7 +662,7 @@ void IconDatabase::setIconURLForPageURL(const String& iconURLOriginal, const Str
// Start the timer to commit this change - or further delay the timer if it was already started
scheduleOrDeferSyncTimer();
- LOG(IconDatabase, "Dispatching notification that we changed an icon mapping for url %s", urlForLogging(pageURL).ascii().data());
+ LOG_INFO(IconDatabase, "Dispatching notification that we changed an icon mapping for url %s", urlForLogging(pageURL).ascii().data());
AutodrainedPool pool;
m_client->didChangeIconForPageURL(pageURL);
}
@@ -681,7 +681,7 @@ IconLoadDecision IconDatabase::synchronousLoadDecisionForIconURL(const String& i
{
MutexLocker locker(m_urlAndIconLock);
if (IconRecord* icon = m_iconURLToRecordMap.get(iconURL)) {
- LOG(IconDatabase, "Found expiration time on a present icon based on existing IconRecord");
+ LOG_INFO(IconDatabase, "Found expiration time on a present icon based on existing IconRecord");
return static_cast<int>(currentTime()) - static_cast<int>(icon->getTimestamp()) > iconExpirationTime ? IconLoadYes : IconLoadNo;
}
}
@@ -693,7 +693,7 @@ IconLoadDecision IconDatabase::synchronousLoadDecisionForIconURL(const String& i
// Otherwise - since we refuse to perform I/O on the main thread to find out for sure - we return the answer that says
// "You might be asked to load this later, so flag that"
- LOG(IconDatabase, "Don't know if we should load %s or not - adding %p to the set of document loaders waiting on a decision", iconURL.ascii().data(), notificationDocumentLoader);
+ LOG_INFO(IconDatabase, "Don't know if we should load %s or not - adding %p to the set of document loaders waiting on a decision", iconURL.ascii().data(), notificationDocumentLoader);
if (notificationDocumentLoader)
m_loadersPendingDecision.add(notificationDocumentLoader);
@@ -741,7 +741,7 @@ void IconDatabase::delayDatabaseCleanup()
{
++databaseCleanupCounter;
if (databaseCleanupCounter == 1)
- LOG(IconDatabase, "Database cleanup is now DISABLED");
+ LOG_INFO(IconDatabase, "Database cleanup is now DISABLED");
}
void IconDatabase::allowDatabaseCleanup()
@@ -749,7 +749,7 @@ void IconDatabase::allowDatabaseCleanup()
if (--databaseCleanupCounter < 0)
databaseCleanupCounter = 0;
if (databaseCleanupCounter == 0)
- LOG(IconDatabase, "Database cleanup is now ENABLED");
+ LOG_INFO(IconDatabase, "Database cleanup is now ENABLED");
}
void IconDatabase::checkIntegrityBeforeOpening()
@@ -805,7 +805,7 @@ IconDatabase::IconDatabase()
, m_initialPruningComplete(false)
, m_client(defaultClient())
{
- LOG(IconDatabase, "Creating IconDatabase %p", this);
+ LOG_INFO(IconDatabase, "Creating IconDatabase %p", this);
ASSERT(isMainThread());
}
@@ -825,7 +825,7 @@ void IconDatabase::notifyPendingLoadDecisions()
// This method should only be called upon completion of the initial url import from the database
ASSERT(m_iconURLImportComplete);
- LOG(IconDatabase, "Notifying all DocumentLoaders that were waiting on a load decision for their icons");
+ LOG_INFO(IconDatabase, "Notifying all DocumentLoaders that were waiting on a load decision for their icons");
HashSet<RefPtr<DocumentLoader> >::iterator i = m_loadersPendingDecision.begin();
HashSet<RefPtr<DocumentLoader> >::iterator end = m_loadersPendingDecision.end();
@@ -943,7 +943,7 @@ PageURLRecord* IconDatabase::getOrCreatePageURLRecord(const String& pageURL)
if (!m_iconURLImportComplete) {
// If the initial import of all URLs hasn't completed and we have no page record, we assume we *might* know about this later and create a record for it
if (!pageRecord) {
- LOG(IconDatabase, "Creating new PageURLRecord for pageURL %s", urlForLogging(pageURL).ascii().data());
+ LOG_INFO(IconDatabase, "Creating new PageURLRecord for pageURL %s", urlForLogging(pageURL).ascii().data());
pageRecord = new PageURLRecord(pageURL);
m_pageURLToRecordMap.set(pageURL, pageRecord);
}
@@ -990,7 +990,7 @@ void IconDatabase::iconDatabaseSyncThread()
ASSERT_ICON_SYNC_THREAD();
- LOG(IconDatabase, "(THREAD) IconDatabase sync thread started");
+ LOG_INFO(IconDatabase, "(THREAD) IconDatabase sync thread started");
#if !LOG_DISABLED
double startTime = currentTime();
@@ -1022,7 +1022,7 @@ void IconDatabase::iconDatabaseSyncThread()
#if !LOG_DISABLED
double timeStamp = currentTime();
- LOG(IconDatabase, "(THREAD) Open took %.4f seconds", timeStamp - startTime);
+ LOG_INFO(IconDatabase, "(THREAD) Open took %.4f seconds", timeStamp - startTime);
#endif
performOpenInitialization();
@@ -1033,7 +1033,7 @@ void IconDatabase::iconDatabaseSyncThread()
#if !LOG_DISABLED
double newStamp = currentTime();
- LOG(IconDatabase, "(THREAD) performOpenInitialization() took %.4f seconds, now %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
+ LOG_INFO(IconDatabase, "(THREAD) performOpenInitialization() took %.4f seconds, now %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
timeStamp = newStamp;
#endif
@@ -1041,7 +1041,7 @@ void IconDatabase::iconDatabaseSyncThread()
// while (currentTime() - timeStamp < 10);
// Read in URL mappings from the database
- LOG(IconDatabase, "(THREAD) Starting iconURL import");
+ LOG_INFO(IconDatabase, "(THREAD) Starting iconURL import");
performURLImport();
if (shouldStopThreadActivity()) {
@@ -1051,10 +1051,10 @@ void IconDatabase::iconDatabaseSyncThread()
#if !LOG_DISABLED
newStamp = currentTime();
- LOG(IconDatabase, "(THREAD) performURLImport() took %.4f seconds. Entering main loop %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
+ LOG_INFO(IconDatabase, "(THREAD) performURLImport() took %.4f seconds. Entering main loop %.4f seconds from thread start", newStamp - timeStamp, newStamp - startTime);
#endif
- LOG(IconDatabase, "(THREAD) Beginning sync");
+ LOG_INFO(IconDatabase, "(THREAD) Beginning sync");
syncThreadMainLoop();
}
@@ -1070,7 +1070,7 @@ static bool isValidDatabase(SQLiteDatabase& db)
return false;
if (databaseVersionNumber(db) < currentDatabaseVersion) {
- LOG(IconDatabase, "DB version is not found or below expected valid version");
+ LOG_INFO(IconDatabase, "DB version is not found or below expected valid version");
return false;
}
@@ -1131,7 +1131,7 @@ void IconDatabase::performOpenInitialization()
if (checkIntegrityOnOpen) {
checkIntegrityOnOpen = false;
if (!checkIntegrity()) {
- LOG(IconDatabase, "Integrity check was bad - dumping IconDatabase");
+ LOG_INFO(IconDatabase, "Integrity check was bad - dumping IconDatabase");
m_syncDB.close();
@@ -1153,14 +1153,14 @@ void IconDatabase::performOpenInitialization()
int version = databaseVersionNumber(m_syncDB);
if (version > currentDatabaseVersion) {
- LOG(IconDatabase, "Database version number %i is greater than our current version number %i - closing the database to prevent overwriting newer versions", version, currentDatabaseVersion);
+ LOG_INFO(IconDatabase, "Database version number %i is greater than our current version number %i - closing the database to prevent overwriting newer versions", version, currentDatabaseVersion);
m_syncDB.close();
m_threadTerminationRequested = true;
return;
}
if (!isValidDatabase(m_syncDB)) {
- LOG(IconDatabase, "%s is missing or in an invalid state - reconstructing", m_completeDatabasePath.ascii().data());
+ LOG_INFO(IconDatabase, "%s is missing or in an invalid state - reconstructing", m_completeDatabasePath.ascii().data());
m_syncDB.clearAllTables();
createDatabaseTables(m_syncDB);
}
@@ -1285,7 +1285,7 @@ void IconDatabase::performURLImport()
// Stop the import at any time of the thread has been asked to shutdown
if (shouldStopThreadActivity()) {
- LOG(IconDatabase, "IconDatabase asked to terminate during performURLImport()");
+ LOG_INFO(IconDatabase, "IconDatabase asked to terminate during performURLImport()");
return;
}
@@ -1293,7 +1293,7 @@ void IconDatabase::performURLImport()
}
if (result != SQLResultDone)
- LOG(IconDatabase, "Error reading page->icon url mappings from database");
+ LOG_INFO(IconDatabase, "Error reading page->icon url mappings from database");
// Clear the m_pageURLsPendingImport set - either the page URLs ended up with an iconURL (that we'll notify about) or not,
// but after m_iconURLImportComplete is set to true, we don't care about this set anymore
@@ -1347,10 +1347,10 @@ void IconDatabase::performURLImport()
}
}
- LOG(IconDatabase, "Notifying %lu interested page URLs that their icon URL is known due to the import", static_cast<unsigned long>(urlsToNotify.size()));
+ LOG_INFO(IconDatabase, "Notifying %lu interested page URLs that their icon URL is known due to the import", static_cast<unsigned long>(urlsToNotify.size()));
// Now that we don't hold any locks, perform the actual notifications
for (unsigned i = 0; i < urlsToNotify.size(); ++i) {
- LOG(IconDatabase, "Notifying icon info known for pageURL %s", urlsToNotify[i].ascii().data());
+ LOG_INFO(IconDatabase, "Notifying icon info known for pageURL %s", urlsToNotify[i].ascii().data());
dispatchDidImportIconURLForPageURLOnMainThread(urlsToNotify[i]);
if (shouldStopThreadActivity())
return;
@@ -1385,7 +1385,7 @@ void IconDatabase::syncThreadMainLoop()
#if !LOG_DISABLED
double timeStamp = currentTime();
#endif
- LOG(IconDatabase, "(THREAD) Main work loop starting");
+ LOG_INFO(IconDatabase, "(THREAD) Main work loop starting");
// If we should remove all icons, do it now. This is an uninteruptible procedure that we will always do before quitting if it is requested
if (m_removeIconsRequested) {
@@ -1423,11 +1423,11 @@ void IconDatabase::syncThreadMainLoop()
#if !LOG_DISABLED
double time = currentTime();
#endif
- LOG(IconDatabase, "(THREAD) Starting pruneUnretainedIcons()");
+ LOG_INFO(IconDatabase, "(THREAD) Starting pruneUnretainedIcons()");
pruneUnretainedIcons();
- LOG(IconDatabase, "(THREAD) pruneUnretainedIcons() took %.4f seconds", currentTime() - time);
+ LOG_INFO(IconDatabase, "(THREAD) pruneUnretainedIcons() took %.4f seconds", currentTime() - time);
// If pruneUnretainedIcons() returned early due to requested thread termination, its still okay
// to mark prunedUnretainedIcons true because we're about to terminate anyway
@@ -1441,7 +1441,7 @@ void IconDatabase::syncThreadMainLoop()
#if !LOG_DISABLED
double newstamp = currentTime();
- LOG(IconDatabase, "(THREAD) Main work loop ran for %.4f seconds, %s requested to terminate", newstamp - timeStamp, shouldStopThreadActivity() ? "was" : "was not");
+ LOG_INFO(IconDatabase, "(THREAD) Main work loop ran for %.4f seconds, %s requested to terminate", newstamp - timeStamp, shouldStopThreadActivity() ? "was" : "was not");
#endif
m_syncLock.lock();
@@ -1574,7 +1574,7 @@ bool IconDatabase::readFromDatabase()
HashSet<String>::const_iterator end = outerHash->end();
for (; iter != end; ++iter) {
if (innerHash->contains(*iter)) {
- LOG(IconDatabase, "%s is interested in the icon we just read. Adding it to the notification list and removing it from the interested set", urlForLogging(*iter).ascii().data());
+ LOG_INFO(IconDatabase, "%s is interested in the icon we just read. Adding it to the notification list and removing it from the interested set", urlForLogging(*iter).ascii().data());
urlsToNotify.add(*iter);
}
@@ -1607,7 +1607,7 @@ bool IconDatabase::readFromDatabase()
HashSet<String>::iterator iter = urlsToNotify.begin();
HashSet<String>::iterator end = urlsToNotify.end();
for (unsigned iteration = 0; iter != end; ++iter, ++iteration) {
- LOG(IconDatabase, "Notifying icon received for pageURL %s", urlForLogging(*iter).ascii().data());
+ LOG_INFO(IconDatabase, "Notifying icon received for pageURL %s", urlForLogging(*iter).ascii().data());
dispatchDidImportIconDataForPageURLOnMainThread(*iter);
if (shouldStopThreadActivity())
return didAnyWork;
@@ -1615,14 +1615,14 @@ bool IconDatabase::readFromDatabase()
pool.cycle();
}
- LOG(IconDatabase, "Done notifying %i pageURLs who just received their icons", urlsToNotify.size());
+ LOG_INFO(IconDatabase, "Done notifying %i pageURLs who just received their icons", urlsToNotify.size());
urlsToNotify.clear();
if (shouldStopThreadActivity())
return didAnyWork;
}
- LOG(IconDatabase, "Reading from database took %.4f seconds", currentTime() - timeStamp);
+ LOG_INFO(IconDatabase, "Reading from database took %.4f seconds", currentTime() - timeStamp);
return didAnyWork;
}
@@ -1662,7 +1662,7 @@ bool IconDatabase::writeToDatabase()
for (unsigned i = 0; i < iconSnapshots.size(); ++i) {
writeIconSnapshotToSQLDatabase(iconSnapshots[i]);
- LOG(IconDatabase, "Wrote IconRecord for IconURL %s with timeStamp of %i to the DB", urlForLogging(iconSnapshots[i].iconURL()).ascii().data(), iconSnapshots[i].timestamp());
+ LOG_INFO(IconDatabase, "Wrote IconRecord for IconURL %s with timeStamp of %i to the DB", urlForLogging(iconSnapshots[i].iconURL()).ascii().data(), iconSnapshots[i].timestamp());
}
for (unsigned i = 0; i < pageSnapshots.size(); ++i) {
@@ -1672,7 +1672,7 @@ bool IconDatabase::writeToDatabase()
removePageURLFromSQLDatabase(pageSnapshots[i].pageURL());
else
setIconURLForPageURLInSQLDatabase(pageSnapshots[i].iconURL(), pageSnapshots[i].pageURL());
- LOG(IconDatabase, "Committed IconURL for PageURL %s to database", urlForLogging(pageSnapshots[i].pageURL()).ascii().data());
+ LOG_INFO(IconDatabase, "Committed IconURL for PageURL %s to database", urlForLogging(pageSnapshots[i].pageURL()).ascii().data());
}
syncTransaction.commit();
@@ -1682,7 +1682,7 @@ bool IconDatabase::writeToDatabase()
if (didAnyWork)
checkForDanglingPageURLs(false);
- LOG(IconDatabase, "Updating the database took %.4f seconds", currentTime() - timeStamp);
+ LOG_INFO(IconDatabase, "Updating the database took %.4f seconds", currentTime() - timeStamp);
return didAnyWork;
}
@@ -1727,9 +1727,9 @@ void IconDatabase::pruneUnretainedIcons()
pageDeleteSQL.prepare();
for (size_t i = 0; i < numToDelete; ++i) {
#if OS(WINDOWS)
- LOG(IconDatabase, "Pruning page with rowid %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
+ LOG_INFO(IconDatabase, "Pruning page with rowid %I64i from disk", static_cast<long long>(pageIDsToDelete[i]));
#else
- LOG(IconDatabase, "Pruning page with rowid %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
+ LOG_INFO(IconDatabase, "Pruning page with rowid %lli from disk", static_cast<long long>(pageIDsToDelete[i]));
#endif
pageDeleteSQL.bindInt64(1, pageIDsToDelete[i]);
int result = pageDeleteSQL.step();
@@ -1787,9 +1787,9 @@ void IconDatabase::checkForDanglingPageURLs(bool pruneIfFound)
if ((pruneIfFound || !danglersFound) && SQLiteStatement(m_syncDB, "SELECT url FROM PageURL WHERE PageURL.iconID NOT IN (SELECT iconID FROM IconInfo) LIMIT 1;").returnsAtLeastOneResult()) {
danglersFound = true;
- LOG(IconDatabase, "Dangling PageURL entries found");
+ LOG_INFO(IconDatabase, "Dangling PageURL entries found");
if (pruneIfFound && !m_syncDB.executeCommand("DELETE FROM PageURL WHERE iconID NOT IN (SELECT iconID FROM IconInfo);"))
- LOG(IconDatabase, "Unable to prune dangling PageURLs");
+ LOG_INFO(IconDatabase, "Unable to prune dangling PageURLs");
}
}
@@ -1797,7 +1797,7 @@ void IconDatabase::removeAllIconsOnThread()
{
ASSERT_ICON_SYNC_THREAD();
- LOG(IconDatabase, "Removing all icons on the sync thread");
+ LOG_INFO(IconDatabase, "Removing all icons on the sync thread");
// Delete all the prepared statements so they can start over
deleteAllPreparedStatements();
@@ -1808,7 +1808,7 @@ void IconDatabase::removeAllIconsOnThread()
m_syncDB.runVacuumCommand();
createDatabaseTables(m_syncDB);
- LOG(IconDatabase, "Dispatching notification that we removed all icons");
+ LOG_INFO(IconDatabase, "Dispatching notification that we removed all icons");
dispatchDidRemoveAllIconsOnMainThread();
}
@@ -1845,7 +1845,7 @@ void* IconDatabase::cleanupSyncThread()
removeAllIconsOnThread();
// Sync remaining icons out
- LOG(IconDatabase, "(THREAD) Doing final writeout and closure of sync thread");
+ LOG_INFO(IconDatabase, "(THREAD) Doing final writeout and closure of sync thread");
writeToDatabase();
// Close the database
@@ -1857,7 +1857,7 @@ void* IconDatabase::cleanupSyncThread()
m_syncDB.close();
#if !LOG_DISABLED
- LOG(IconDatabase, "(THREAD) Final closure took %.4f seconds", currentTime() - timeStamp);
+ LOG_INFO(IconDatabase, "(THREAD) Final closure took %.4f seconds", currentTime() - timeStamp);
#endif
m_syncThreadRunning = false;
@@ -1872,7 +1872,7 @@ inline void readySQLiteStatement(OwnPtr<SQLiteStatement>& statement, SQLiteDatab
{
if (statement && (statement->database() != &db || statement->isExpired())) {
if (statement->isExpired())
- LOG(IconDatabase, "SQLiteStatement associated with %s is expired", str.ascii().data());
+ LOG_INFO(IconDatabase, "SQLiteStatement associated with %s is expired", str.ascii().data());
statement.clear();
}
if (!statement) {
@@ -2053,7 +2053,7 @@ void IconDatabase::writeIconSnapshotToSQLDatabase(const IconSnapshot& snapshot)
// A nulled out timestamp and data means this icon is destined to be deleted - do that instead of writing it out
if (!snapshot.timestamp() && !snapshot.data()) {
- LOG(IconDatabase, "Removing %s from on-disk database", urlForLogging(snapshot.iconURL()).ascii().data());
+ LOG_INFO(IconDatabase, "Removing %s from on-disk database", urlForLogging(snapshot.iconURL()).ascii().data());
removeIconFromSQLDatabase(snapshot.iconURL());
return;
}
« no previous file with comments | « Source/WebCore/loader/icon/IconController.cpp ('k') | Source/WebCore/loader/icon/IconLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698