<!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>[186451] releases/WebKitGTK/webkit-2.8/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/186451">186451</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-07 05:17:28 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186287">r186287</a> - [WK2] WebBackForwardListItems' pageState is not kept up-to-date
https://bugs.webkit.org/show_bug.cgi?id=146614
<rdar://problem/21585268>
Reviewed by Gavin Barraclough.
WebBackForwardListItems' pageState on UIProcess-side were not kept
up-to-date when it was updated on WebContent process side. This meant
that we were losing the scroll position (among other things) when
transferring the session state over from one view to another.
We now call notifyHistoryItemChanged(item) after saving the scroll
position and the view state on the HistoryItem. As a result, the
WebBackForwardListProxy will send the updated pageState to the
UIProcess.
* history/HistoryItem.cpp:
(WebCore::HistoryItem::notifyChanged):
* history/HistoryItem.h:
* loader/HistoryController.cpp:
(WebCore::HistoryController::saveScrollPositionAndViewStateToItem):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehistoryHistoryItemcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorehistoryHistoryItemh">releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderHistoryControllercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/HistoryController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186450 => 186451)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 12:15:10 UTC (rev 186450)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 12:17:28 UTC (rev 186451)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-07-05 Chris Dumez <cdumez@apple.com>
+
+ [WK2] WebBackForwardListItems' pageState is not kept up-to-date
+ https://bugs.webkit.org/show_bug.cgi?id=146614
+ <rdar://problem/21585268>
+
+ Reviewed by Gavin Barraclough.
+
+ WebBackForwardListItems' pageState on UIProcess-side were not kept
+ up-to-date when it was updated on WebContent process side. This meant
+ that we were losing the scroll position (among other things) when
+ transferring the session state over from one view to another.
+
+ We now call notifyHistoryItemChanged(item) after saving the scroll
+ position and the view state on the HistoryItem. As a result, the
+ WebBackForwardListProxy will send the updated pageState to the
+ UIProcess.
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::notifyChanged):
+ * history/HistoryItem.h:
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::saveScrollPositionAndViewStateToItem):
+
</ins><span class="cx"> 2015-07-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r178097): HTMLSelectElement.add(option, undefined) prepends option to the list of options; should append to the end of the list of options
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.cpp (186450 => 186451)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.cpp 2015-07-07 12:15:10 UTC (rev 186450)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.cpp 2015-07-07 12:17:28 UTC (rev 186451)
</span><span class="lines">@@ -571,6 +571,11 @@
</span><span class="cx"> m_redirectURLs = WTF::move(redirectURLs);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HistoryItem::notifyChanged()
+{
+ notifyHistoryItemChanged(this);
+}
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">
</span><span class="cx"> int HistoryItem::showTree() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.h (186450 => 186451)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.h 2015-07-07 12:15:10 UTC (rev 186450)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/history/HistoryItem.h 2015-07-07 12:17:28 UTC (rev 186451)
</span><span class="lines">@@ -206,6 +206,8 @@
</span><span class="cx"> void setSharedLinkUniqueIdentifier(const String& sharedLinkUniqueidentifier) { m_sharedLinkUniqueIdentifier = sharedLinkUniqueidentifier; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void notifyChanged();
+
</ins><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT HistoryItem();
</span><span class="cx"> WEBCORE_EXPORT HistoryItem(const String& urlString, const String& title);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/HistoryController.cpp (186450 => 186451)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/HistoryController.cpp 2015-07-07 12:15:10 UTC (rev 186450)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/HistoryController.cpp 2015-07-07 12:17:28 UTC (rev 186451)
</span><span class="lines">@@ -90,6 +90,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: It would be great to work out a way to put this code in WebCore instead of calling through to the client.
</span><span class="cx"> m_frame.loader().client().saveViewStateToItem(item);
</span><ins>+
+ // Notify clients that the HistoryItem has changed.
+ item->notifyChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HistoryController::clearScrollPositionAndViewState()
</span></span></pre>
</div>
</div>
</body>
</html>