| Index: Source/WebCore/loader/HistoryController.cpp
|
| diff --git a/Source/WebCore/loader/HistoryController.cpp b/Source/WebCore/loader/HistoryController.cpp
|
| index 456635c2474880d22d8c582514384e3cd0d74da4..a3090c6140f31b2fe314f5d989ae3d94762057ba 100644
|
| --- a/Source/WebCore/loader/HistoryController.cpp
|
| +++ b/Source/WebCore/loader/HistoryController.cpp
|
| @@ -186,7 +186,7 @@ void HistoryController::saveDocumentState()
|
| ASSERT(document);
|
|
|
| if (item->isCurrentDocument(document) && document->attached()) {
|
| - LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
|
| + LOG_INFO(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->uniqueName().string().utf8().data(), item);
|
| item->setDocumentState(document->formElementsState());
|
| }
|
| }
|
| @@ -240,7 +240,7 @@ void HistoryController::restoreDocumentState()
|
| if (!itemToRestore)
|
| return;
|
| if (isAssociatedToRequestedHistoryItem(itemToRestore, m_frame, m_frame->loader()->requestedHistoryItem()) && !m_frame->loader()->documentLoader()->isClientRedirect()) {
|
| - LOG(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
|
| + LOG_INFO(Loading, "WebCoreLoading %s: restoring form state from %p", m_frame->tree()->uniqueName().string().utf8().data(), itemToRestore);
|
| doc->setStateForNewFormElements(itemToRestore->documentState());
|
| }
|
| }
|
| @@ -326,7 +326,7 @@ void HistoryController::updateForBackForwardNavigation()
|
| {
|
| #if !LOG_DISABLED
|
| if (m_frame->loader()->documentLoader())
|
| - LOG(History, "WebCoreHistory: Updating History for back/forward navigation in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for back/forward navigation in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| #endif
|
|
|
| // Must grab the current scroll position before disturbing it
|
| @@ -342,7 +342,7 @@ void HistoryController::updateForReload()
|
| {
|
| #if !LOG_DISABLED
|
| if (m_frame->loader()->documentLoader())
|
| - LOG(History, "WebCoreHistory: Updating History for reload in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for reload in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| #endif
|
|
|
| if (m_currentItem) {
|
| @@ -365,7 +365,7 @@ void HistoryController::updateForReload()
|
|
|
| void HistoryController::updateForStandardLoad(HistoryUpdateType updateType)
|
| {
|
| - LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", m_frame->loader()->documentLoader()->url().string().ascii().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for Standard Load in frame %s", m_frame->loader()->documentLoader()->url().string().ascii().data());
|
|
|
| FrameLoader* frameLoader = m_frame->loader();
|
|
|
| @@ -404,7 +404,7 @@ void HistoryController::updateForRedirectWithLockedBackForwardList()
|
| {
|
| #if !LOG_DISABLED
|
| if (m_frame->loader()->documentLoader())
|
| - LOG(History, "WebCoreHistory: Updating History for redirect load in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for redirect load in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| #endif
|
|
|
| Settings* settings = m_frame->settings();
|
| @@ -446,7 +446,7 @@ void HistoryController::updateForClientRedirect()
|
| {
|
| #if !LOG_DISABLED
|
| if (m_frame->loader()->documentLoader())
|
| - LOG(History, "WebCoreHistory: Updating History for client redirect in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for client redirect in frame %s", m_frame->loader()->documentLoader()->title().string().utf8().data());
|
| #endif
|
|
|
| // Clear out form data so we don't try to restore it into the incoming page. Must happen after
|
| @@ -471,7 +471,7 @@ void HistoryController::updateForCommit()
|
| FrameLoader* frameLoader = m_frame->loader();
|
| #if !LOG_DISABLED
|
| if (frameLoader->documentLoader())
|
| - LOG(History, "WebCoreHistory: Updating History for commit in frame %s", frameLoader->documentLoader()->title().string().utf8().data());
|
| + LOG_INFO(History, "WebCoreHistory: Updating History for commit in frame %s", frameLoader->documentLoader()->title().string().utf8().data());
|
| #endif
|
| FrameLoadType type = frameLoader->loadType();
|
| if (isBackForwardLoadType(type)
|
| @@ -830,7 +830,7 @@ void HistoryController::updateBackForwardListClippedAtTarget(bool doClip)
|
| frameLoader->checkDidPerformFirstNavigation();
|
|
|
| RefPtr<HistoryItem> topItem = frameLoader->history()->createItemTree(m_frame, doClip);
|
| - LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", topItem.get(), m_frame->loader()->documentLoader()->url().string().ascii().data());
|
| + LOG_INFO(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", topItem.get(), m_frame->loader()->documentLoader()->url().string().ascii().data());
|
| page->backForward()->addItem(topItem.release());
|
| }
|
|
|
|
|