<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187592] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187592">187592</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-30 11:31:01 -0700 (Thu, 30 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the history logging output
https://bugs.webkit.org/show_bug.cgi?id=147429
Reviewed by Alexey Proskuryakov.
Improve the History log channel output to show which frame is navigating,
print the addresses of the HistoryController and Frame, and print URLs
for everything.
Remove the BackForward log channel which had just one calling location,
and log for pushState/replaceState.
* loader/HistoryController.cpp:
(WebCore::HistoryController::updateForBackForwardNavigation):
(WebCore::HistoryController::updateForReload):
(WebCore::HistoryController::updateForStandardLoad):
(WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
(WebCore::HistoryController::updateForClientRedirect):
(WebCore::HistoryController::updateForCommit):
(WebCore::HistoryController::updateBackForwardListClippedAtTarget):
(WebCore::HistoryController::pushState):
(WebCore::HistoryController::replaceState):
* platform/Logging.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187591 => 187592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-30 18:29:18 UTC (rev 187591)
+++ trunk/Source/WebCore/ChangeLog 2015-07-30 18:31:01 UTC (rev 187592)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-07-30 Simon Fraser <simon.fraser@apple.com>
+
+ Improve the history logging output
+ https://bugs.webkit.org/show_bug.cgi?id=147429
+
+ Reviewed by Alexey Proskuryakov.
+
+ Improve the History log channel output to show which frame is navigating,
+ print the addresses of the HistoryController and Frame, and print URLs
+ for everything.
+
+ Remove the BackForward log channel which had just one calling location,
+ and log for pushState/replaceState.
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::updateForBackForwardNavigation):
+ (WebCore::HistoryController::updateForReload):
+ (WebCore::HistoryController::updateForStandardLoad):
+ (WebCore::HistoryController::updateForRedirectWithLockedBackForwardList):
+ (WebCore::HistoryController::updateForClientRedirect):
+ (WebCore::HistoryController::updateForCommit):
+ (WebCore::HistoryController::updateBackForwardListClippedAtTarget):
+ (WebCore::HistoryController::pushState):
+ (WebCore::HistoryController::replaceState):
+ * platform/Logging.h:
+
</ins><span class="cx"> 2015-07-29 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: add infrastructure for testing media control events
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (187591 => 187592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2015-07-30 18:29:18 UTC (rev 187591)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2015-07-30 18:31:01 UTC (rev 187592)
</span><span class="lines">@@ -316,10 +316,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForBackForwardNavigation()
</span><span class="cx"> {
</span><del>-#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());
-#endif
</del><ins>+ LOG(History, "HistoryController %p updateForBackForwardNavigation: Updating History for back/forward navigation in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->url().string().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> // Must grab the current scroll position before disturbing it
</span><span class="cx"> if (!m_frameLoadComplete)
</span><span class="lines">@@ -332,10 +329,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForReload()
</span><span class="cx"> {
</span><del>-#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());
-#endif
</del><ins>+ LOG(History, "HistoryController %p updateForBackForwardNavigation: Updating History for reload in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->url().string().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> if (m_currentItem) {
</span><span class="cx"> PageCache::singleton().remove(*m_currentItem);
</span><span class="lines">@@ -360,7 +354,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForStandardLoad(HistoryUpdateType updateType)
</span><span class="cx"> {
</span><del>- LOG(History, "WebCoreHistory: Updating History for Standard Load in frame %s", m_frame.loader().documentLoader()->url().string().ascii().data());
</del><ins>+ LOG(History, "HistoryController %p updateForStandardLoad: Updating History for standard load in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader()->url().string().ascii().data());
</ins><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = m_frame.loader();
</span><span class="cx">
</span><span class="lines">@@ -396,10 +390,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForRedirectWithLockedBackForwardList()
</span><span class="cx"> {
</span><del>-#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());
-#endif
</del><ins>+ LOG(History, "HistoryController %p updateForRedirectWithLockedBackForwardList: Updating History for redirect load in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->url().string().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> bool needPrivacy = m_frame.page()->usesEphemeralSession();
</span><span class="cx"> const URL& historyURL = m_frame.loader().documentLoader()->urlForHistory();
</span><span class="lines">@@ -437,10 +428,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForClientRedirect()
</span><span class="cx"> {
</span><del>-#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());
-#endif
</del><ins>+ LOG(History, "HistoryController %p updateForClientRedirect: Updating History for client redirect in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->url().string().utf8().data() : "");
</ins><span class="cx">
</span><span class="cx"> // Clear out form data so we don't try to restore it into the incoming page. Must happen after
</span><span class="cx"> // webcore has closed the URL and saved away the form state.
</span><span class="lines">@@ -461,10 +449,8 @@
</span><span class="cx"> void HistoryController::updateForCommit()
</span><span class="cx"> {
</span><span class="cx"> FrameLoader& frameLoader = m_frame.loader();
</span><del>-#if !LOG_DISABLED
- if (frameLoader.documentLoader())
- LOG(History, "WebCoreHistory: Updating History for commit in frame %s", frameLoader.documentLoader()->title().string().utf8().data());
-#endif
</del><ins>+ LOG(History, "HistoryController %p updateForCommit: Updating History for commit in frame %p (main frame %d) %s", this, &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader() ? m_frame.loader().documentLoader()->url().string().utf8().data() : "");
+
</ins><span class="cx"> FrameLoadType type = frameLoader.loadType();
</span><span class="cx"> if (isBackForwardLoadType(type)
</span><span class="cx"> || isReplaceLoadTypeWithProvisionalItem(type)
</span><span class="lines">@@ -812,7 +798,8 @@
</span><span class="cx"> FrameLoader& frameLoader = m_frame.mainFrame().loader();
</span><span class="cx">
</span><span class="cx"> Ref<HistoryItem> topItem = frameLoader.history().createItemTree(m_frame, doClip);
</span><del>- LOG(BackForward, "WebCoreBackForward - Adding backforward item %p for frame %s", topItem.ptr(), m_frame.loader().documentLoader()->url().string().ascii().data());
</del><ins>+ LOG(History, "HistoryController %p updateBackForwardListClippedAtTarget: Adding backforward item %p in frame %p (main frame %d) %s", this, topItem.ptr(), &m_frame, m_frame.isMainFrame(), m_frame.loader().documentLoader()->url().string().utf8().data());
+
</ins><span class="cx"> page->backForward().addItem(WTF::move(topItem));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,6 +845,8 @@
</span><span class="cx"> m_currentItem->setStateObject(stateObject);
</span><span class="cx"> m_currentItem->setURLString(urlString);
</span><span class="cx">
</span><ins>+ LOG(History, "HistoryController %p pushState: Adding top item %p, setting url of current item %p to %s", this, topItem.ptr(), m_currentItem.get(), urlString.ascii().data());
+
</ins><span class="cx"> page->backForward().addItem(WTF::move(topItem));
</span><span class="cx">
</span><span class="cx"> if (m_frame.page()->usesEphemeralSession())
</span><span class="lines">@@ -872,6 +861,8 @@
</span><span class="cx"> if (!m_currentItem)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(History, "HistoryController %p replaceState: Setting url of current item %p to %s", this, m_currentItem.get(), urlString.ascii().data());
+
</ins><span class="cx"> if (!urlString.isEmpty())
</span><span class="cx"> m_currentItem->setURLString(urlString);
</span><span class="cx"> m_currentItem->setTitle(title);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (187591 => 187592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.h 2015-07-30 18:29:18 UTC (rev 187591)
+++ trunk/Source/WebCore/platform/Logging.h 2015-07-30 18:31:01 UTC (rev 187592)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #define WEBCORE_LOG_CHANNELS(M) \
</span><span class="cx"> M(Animations) \
</span><span class="cx"> M(Archives) \
</span><del>- M(BackForward) \
</del><span class="cx"> M(Compositing) \
</span><span class="cx"> M(ContentFiltering) \
</span><span class="cx"> M(DOMTimers) \
</span></span></pre>
</div>
</div>
</body>
</html>