<!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>[212250] 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/212250">212250</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-13 14:53:46 -0800 (Mon, 13 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Log to the History Channel in a few more places
https://bugs.webkit.org/show_bug.cgi?id=168252
Reviewed by Brady Eidson.
*** Aliens ***
* loader/HistoryController.cpp:
(WebCore::HistoryController::restoreScrollPositionAndViewState):
(WebCore::HistoryController::updateForReload):
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::scheduleHistoryNavigation):
(WebCore::NavigationScheduler::timerFired):
(WebCore::NavigationScheduler::cancel):
* page/History.cpp:
(WebCore::History::go):</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="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageHistorycpp">trunk/Source/WebCore/page/History.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212249 => 212250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-13 22:52:34 UTC (rev 212249)
+++ trunk/Source/WebCore/ChangeLog 2017-02-13 22:53:46 UTC (rev 212250)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-13 Simon Fraser <simon.fraser@apple.com>
+
+ Log to the History Channel in a few more places
+ https://bugs.webkit.org/show_bug.cgi?id=168252
+
+ Reviewed by Brady Eidson.
+
+ *** Aliens ***
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+ (WebCore::HistoryController::updateForReload):
+ * loader/NavigationScheduler.cpp:
+ (WebCore::NavigationScheduler::scheduleHistoryNavigation):
+ (WebCore::NavigationScheduler::timerFired):
+ (WebCore::NavigationScheduler::cancel):
+ * page/History.cpp:
+ (WebCore::History::go):
+
</ins><span class="cx"> 2017-02-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Percent should be allowed in non-special URL hosts
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (212249 => 212250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2017-02-13 22:52:34 UTC (rev 212249)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2017-02-13 22:53:46 UTC (rev 212250)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> if (view && !view->wasScrolledByUser()) {
</span><span class="cx"> Page* page = m_frame.page();
</span><span class="cx"> auto desiredScrollPosition = m_currentItem->scrollPosition();
</span><del>-
</del><ins>+ LOG(Scrolling, "HistoryController::restoreScrollPositionAndViewState scrolling to %d,%d", desiredScrollPosition.x(), desiredScrollPosition.y());
</ins><span class="cx"> if (page && m_frame.isMainFrame() && m_currentItem->pageScaleFactor())
</span><span class="cx"> page->setPageScaleFactor(m_currentItem->pageScaleFactor() * page->viewScaleFactor(), desiredScrollPosition);
</span><span class="cx"> else
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx">
</span><span class="cx"> void HistoryController::updateForReload()
</span><span class="cx"> {
</span><del>- 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() : "");
</del><ins>+ LOG(History, "HistoryController %p updateForReload: 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></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (212249 => 212250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2017-02-13 22:52:34 UTC (rev 212249)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2017-02-13 22:53:46 UTC (rev 212250)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HistoryItem.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "UserGestureIndicator.h"
</span><span class="lines">@@ -462,6 +463,7 @@
</span><span class="cx">
</span><span class="cx"> void NavigationScheduler::scheduleHistoryNavigation(int steps)
</span><span class="cx"> {
</span><ins>+ LOG(History, "NavigationScheduler %p scheduleHistoryNavigation(%d) - shouldSchedule %d", this, steps, shouldScheduleNavigation());
</ins><span class="cx"> if (!shouldScheduleNavigation())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -495,6 +497,8 @@
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ScheduledNavigation> redirect = WTFMove(m_redirect);
</span><ins>+ LOG(History, "NavigationScheduler %p timerFired - firing redirect %p", this, redirect.get());
+
</ins><span class="cx"> redirect->fire(m_frame);
</span><span class="cx"> InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
</span><span class="cx"> }
</span><span class="lines">@@ -545,6 +549,8 @@
</span><span class="cx">
</span><span class="cx"> void NavigationScheduler::cancel(bool newLoadInProgress)
</span><span class="cx"> {
</span><ins>+ LOG(History, "NavigationScheduler %p cancel(newLoadInProgress=%d)", this, newLoadInProgress);
+
</ins><span class="cx"> if (m_timer.isActive())
</span><span class="cx"> InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
</span><span class="cx"> m_timer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCorepageHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/History.cpp (212249 => 212250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/History.cpp 2017-02-13 22:52:34 UTC (rev 212249)
+++ trunk/Source/WebCore/page/History.cpp 2017-02-13 22:53:46 UTC (rev 212250)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "HistoryController.h"
</span><span class="cx"> #include "HistoryItem.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="lines">@@ -106,6 +107,8 @@
</span><span class="cx">
</span><span class="cx"> void History::go(int distance)
</span><span class="cx"> {
</span><ins>+ LOG(History, "History %p go(%d) frame %p (main frame %d)", this, distance, m_frame, m_frame ? m_frame->isMainFrame() : false);
+
</ins><span class="cx"> if (!m_frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -114,6 +117,8 @@
</span><span class="cx">
</span><span class="cx"> void History::go(Document& document, int distance)
</span><span class="cx"> {
</span><ins>+ LOG(History, "History %p go(%d) in document %p frame %p (main frame %d)", this, distance, &document, m_frame, m_frame ? m_frame->isMainFrame() : false);
+
</ins><span class="cx"> if (!m_frame)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>