<!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>[55555] trunk</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/55555">55555</a></dd>
<dt>Author</dt> <dd>japhet@chromium.org</dd>
<dt>Date</dt> <dd>2010-03-04 15:01:45 -0800 (Thu, 04 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-04  Nate Chapin  &lt;japhet@chromium.org&gt;

        Reviewed by Kenneth Rohde Christiansen.

        Fix the case where we do a same document navigation, scroll,
        then repeat the same document navigation.  Currently, the second
        navigation does nothing.

        https://bugs.webkit.org/show_bug.cgi?id=35547

        Test: fast/loader/repeat-same-document-navigation.html

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::loadInSameDocument): Call scrollToFragment() whether or not the hash changed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderFrameLoadercpp">trunk/WebCore/loader/FrameLoader.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastloaderrepeatsamedocumentnavigationexpectedtxt">trunk/LayoutTests/fast/loader/repeat-same-document-navigation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastloaderrepeatsamedocumentnavigationhtml">trunk/LayoutTests/fast/loader/repeat-same-document-navigation.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (55554 => 55555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-04 22:31:15 UTC (rev 55554)
+++ trunk/LayoutTests/ChangeLog        2010-03-04 23:01:45 UTC (rev 55555)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2010-03-04  Nate Chapin  &lt;japhet@chromium.org&gt;
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=35547.
+
+        * fast/loader/repeat-same-document-navigation-expected.txt: Added.
+        * fast/loader/repeat-same-document-navigation.html: Added.
+
</ins><span class="cx"> 2010-03-04  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span></span></pre></div>
<a id="trunkLayoutTestsfastloaderrepeatsamedocumentnavigationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/repeat-same-document-navigation-expected.txt (0 => 55555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/repeat-same-document-navigation-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/loader/repeat-same-document-navigation-expected.txt        2010-03-04 23:01:45 UTC (rev 55555)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Anchor link
+Scroll position is 608px
</ins></span></pre></div>
<a id="trunkLayoutTestsfastloaderrepeatsamedocumentnavigationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/loader/repeat-same-document-navigation.html (0 => 55555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/loader/repeat-same-document-navigation.html                                (rev 0)
+++ trunk/LayoutTests/fast/loader/repeat-same-document-navigation.html        2010-03-04 23:01:45 UTC (rev 55555)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script&gt;
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+
+function clickLink() {
+    var link = document.getElementById(&quot;anchorLink&quot;);
+    eventSender.mouseMoveTo(link.offsetLeft + 2, link.offsetTop + 2);
+    eventSender.mouseDown(); 
+    eventSender.mouseUp(); 
+}
+
+function run() {
+    clickLink();
+    window.scroll(0, 0);
+    clickLink();
+    var scrollY = window.scrollY;
+    var line = document.createElement('div');
+    line.appendChild(document.createTextNode(&quot;Scroll position is &quot; + scrollY + &quot;px&quot;));
+    document.getElementById('anchor').appendChild(line);
+    layoutTestController.notifyDone();    
+}
+
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body onload=&quot;run();&quot;&gt;
+&lt;div style=&quot;height: 600px&quot;&gt;
+&lt;a id=&quot;anchorLink&quot; href=&quot;#anchor&quot;&gt;Anchor link&lt;/a&gt;
+&lt;/div&gt;
+&lt;div id=&quot;anchor&quot; style=&quot;height: 600px&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55554 => 55555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-04 22:31:15 UTC (rev 55554)
+++ trunk/WebCore/ChangeLog        2010-03-04 23:01:45 UTC (rev 55555)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2010-03-04  Nate Chapin  &lt;japhet@chromium.org&gt;
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix the case where we do a same document navigation, scroll,
+        then repeat the same document navigation.  Currently, the second
+        navigation does nothing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35547
+
+        Test: fast/loader/repeat-same-document-navigation.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadInSameDocument): Call scrollToFragment() whether or not the hash changed.
+
</ins><span class="cx"> 2010-03-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Build fix.
</span></span></pre></div>
<a id="trunkWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/FrameLoader.cpp (55554 => 55555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/FrameLoader.cpp        2010-03-04 22:31:15 UTC (rev 55554)
+++ trunk/WebCore/loader/FrameLoader.cpp        2010-03-04 23:01:45 UTC (rev 55555)
</span><span class="lines">@@ -1757,12 +1757,12 @@
</span><span class="cx">     // It's important to model this as a load that starts and immediately finishes.
</span><span class="cx">     // Otherwise, the parent frame may think we never finished loading.
</span><span class="cx">     started();
</span><ins>+
+    // We need to scroll to the fragment whether or not a hash change occurred, since
+    // the user might have scrolled since the previous navigation.
+    if (FrameView* view = m_frame-&gt;view())
+        view-&gt;scrollToFragment(m_URL);
</ins><span class="cx">     
</span><del>-    if (hashChange) {
-        if (FrameView* view = m_frame-&gt;view())
-            view-&gt;scrollToFragment(m_URL);
-    }
-    
</del><span class="cx">     m_isComplete = false;
</span><span class="cx">     checkCompleted();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>