| Index: Source/WebCore/loader/icon/IconController.cpp
|
| diff --git a/Source/WebCore/loader/icon/IconController.cpp b/Source/WebCore/loader/icon/IconController.cpp
|
| index 8f23f6db1110a703928926bf117e26e19931aae2..f403bf9d7cd0cbd8b49da02b2f25baf8b87b12f4 100644
|
| --- a/Source/WebCore/loader/icon/IconController.cpp
|
| +++ b/Source/WebCore/loader/icon/IconController.cpp
|
| @@ -121,7 +121,7 @@ IconURLs IconController::urlsForTypes(int iconTypesMask)
|
|
|
| void IconController::commitToDatabase(const KURL& icon)
|
| {
|
| - LOG(IconDatabase, "Committing iconURL %s to database for pageURLs %s and %s", icon.string().ascii().data(), m_frame->document()->url().string().ascii().data(), m_frame->loader()->initialRequest().url().string().ascii().data());
|
| + LOG_INFO(IconDatabase, "Committing iconURL %s to database for pageURLs %s and %s", icon.string().ascii().data(), m_frame->document()->url().string().ascii().data(), m_frame->loader()->initialRequest().url().string().ascii().data());
|
| iconDatabase().setIconURLForPageURL(icon.string(), m_frame->document()->url().string());
|
| iconDatabase().setIconURLForPageURL(icon.string(), m_frame->loader()->initialRequest().url().string());
|
| }
|
| @@ -172,7 +172,7 @@ void IconController::startLoader()
|
| // just in case we don't end up loading later - if we commit the mapping a second time after the load, that's no big deal
|
| // We also tell the client to register for the notification that the icon is received now so it isn't missed in case the
|
| // icon is later read in from disk
|
| - LOG(IconDatabase, "IconController %p might load icon %s later", this, urlString.ascii().data());
|
| + LOG_INFO(IconDatabase, "IconController %p might load icon %s later", this, urlString.ascii().data());
|
| m_waitingForLoadDecision = true;
|
| m_frame->loader()->client()->registerForIconNotification();
|
| commitToDatabase(iconURL);
|
| @@ -193,7 +193,7 @@ void IconController::loadDecisionReceived(IconLoadDecision iconLoadDecision)
|
| {
|
| if (!m_waitingForLoadDecision)
|
| return;
|
| - LOG(IconDatabase, "IconController %p was told a load decision is available for its icon", this);
|
| + LOG_INFO(IconDatabase, "IconController %p was told a load decision is available for its icon", this);
|
| continueLoadWithDecision(iconLoadDecision);
|
| m_waitingForLoadDecision = false;
|
| }
|
| @@ -212,7 +212,7 @@ void IconController::continueLoadWithDecision(IconLoadDecision iconLoadDecision)
|
| if (urlString.isEmpty())
|
| return;
|
|
|
| - LOG(IconDatabase, "IconController::startLoader() - Told not to load this icon, committing iconURL %s to database for pageURL mapping", urlString.ascii().data());
|
| + LOG_INFO(IconDatabase, "IconController::startLoader() - Told not to load this icon, committing iconURL %s to database for pageURL mapping", urlString.ascii().data());
|
| commitToDatabase(iconURL);
|
|
|
| if (iconDatabase().supportsAsynchronousMode()) {
|
| @@ -225,7 +225,7 @@ void IconController::continueLoadWithDecision(IconLoadDecision iconLoadDecision)
|
| // has done it. This is after registering for the notification so the WebView can call the appropriate delegate method.
|
| // Otherwise if the icon data *is* available, notify the delegate
|
| if (!iconDatabase().synchronousIconDataKnownForIconURL(urlString)) {
|
| - LOG(IconDatabase, "Told not to load icon %s but icon data is not yet available - registering for notification and requesting load from disk", urlString.ascii().data());
|
| + LOG_INFO(IconDatabase, "Told not to load icon %s but icon data is not yet available - registering for notification and requesting load from disk", urlString.ascii().data());
|
| m_frame->loader()->client()->registerForIconNotification();
|
| iconDatabase().synchronousIconForPageURL(m_frame->document()->url().string(), IntSize(0, 0));
|
| iconDatabase().synchronousIconForPageURL(m_frame->loader()->initialRequest().url().string(), IntSize(0, 0));
|
|
|