<!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>[212197] 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/212197">212197</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-11 19:18:09 -0800 (Sat, 11 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid a redundant scroll to 0,0 when navigating back to a url with no fragment
https://bugs.webkit.org/show_bug.cgi?id=168177
Reviewed by Sam Weinig.
FrameView::scrollToFragment() is called from FrameLoader::scrollToFragmentWithParentBoundary()
when navigating within the page. If the URL had no fragment identifier, this code would
call into FrameView::scrollToAnchor() with an empty name, where maintainScrollPositionAtAnchor()
used the document as the anchor, thus scrolling to 0,0. Later, history().restoreScrollPositionAndViewState()
the restores the scroll position from history.
This scroll to 0,0 happened to be not visible to the page because of scroll event
coalescing, but it makes implementation of history.scrollRestoration harder, so avoid it
by just returning early from FrameView::scrollToFragment() if there is no fragment,
making sure to clear the document's CSSTarget.
* dom/Document.cpp:
(WebCore::Document::setCSSTarget):
* page/FrameView.cpp:
(WebCore::FrameView::scrollToFragment):
(WebCore::FrameView::scrollToAnchor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212196 => 212197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-11 22:12:36 UTC (rev 212196)
+++ trunk/Source/WebCore/ChangeLog 2017-02-12 03:18:09 UTC (rev 212197)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-02-11 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid a redundant scroll to 0,0 when navigating back to a url with no fragment
+ https://bugs.webkit.org/show_bug.cgi?id=168177
+
+ Reviewed by Sam Weinig.
+
+ FrameView::scrollToFragment() is called from FrameLoader::scrollToFragmentWithParentBoundary()
+ when navigating within the page. If the URL had no fragment identifier, this code would
+ call into FrameView::scrollToAnchor() with an empty name, where maintainScrollPositionAtAnchor()
+ used the document as the anchor, thus scrolling to 0,0. Later, history().restoreScrollPositionAndViewState()
+ the restores the scroll position from history.
+
+ This scroll to 0,0 happened to be not visible to the page because of scroll event
+ coalescing, but it makes implementation of history.scrollRestoration harder, so avoid it
+ by just returning early from FrameView::scrollToFragment() if there is no fragment,
+ making sure to clear the document's CSSTarget.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setCSSTarget):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollToFragment):
+ (WebCore::FrameView::scrollToAnchor):
+
</ins><span class="cx"> 2017-02-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement URL's toJSON()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (212196 => 212197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-02-11 22:12:36 UTC (rev 212196)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-02-12 03:18:09 UTC (rev 212197)
</span><span class="lines">@@ -3796,13 +3796,13 @@
</span><span class="cx"> return node->parentOrShadowHostElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::setCSSTarget(Element* n)
</del><ins>+void Document::setCSSTarget(Element* targetNode)
</ins><span class="cx"> {
</span><span class="cx"> if (m_cssTarget)
</span><span class="cx"> m_cssTarget->invalidateStyleForSubtree();
</span><del>- m_cssTarget = n;
- if (n)
- n->invalidateStyleForSubtree();
</del><ins>+ m_cssTarget = targetNode;
+ if (targetNode)
+ targetNode->invalidateStyleForSubtree();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::registerNodeListForInvalidation(LiveNodeList& list)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (212196 => 212197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2017-02-11 22:12:36 UTC (rev 212196)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-02-12 03:18:09 UTC (rev 212197)
</span><span class="lines">@@ -2335,8 +2335,10 @@
</span><span class="cx"> // OTOH If CSS target was set previously, we want to set it to 0, recalc
</span><span class="cx"> // and possibly repaint because :target pseudo class may have been
</span><span class="cx"> // set (see bug 11321).
</span><del>- if (!url.hasFragmentIdentifier() && !frame().document()->cssTarget())
</del><ins>+ if (!url.hasFragmentIdentifier()) {
+ frame().document()->setCSSTarget(nullptr);
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> String fragmentIdentifier = url.fragmentIdentifier();
</span><span class="cx"> if (scrollToAnchor(fragmentIdentifier))
</span><span class="lines">@@ -2373,7 +2375,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Implement the rule that "" and "top" both mean top of page as in other browsers.
</span><span class="cx"> if (!anchorElement && !(name.isEmpty() || equalLettersIgnoringASCIICase(name, "top")))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>