<!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>[218213] tags/Safari-604.1.25.0.2</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/218213">218213</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2017-06-13 15:21:11 -0700 (Tue, 13 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/218121">r218121</a>.  rdar://problem/32701257</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60412502SourceWebKit2ChangeLog">tags/Safari-604.1.25.0.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari60412502SourceWebKit2UIProcessmacLegacySessionStateCodingcpp">tags/Safari-604.1.25.0.2/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
<li><a href="#tagsSafari60412502ToolsChangeLog">tags/Safari-604.1.25.0.2/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari60412502ToolsTestWebKitAPITestsWebKit2RestoreSessionStatecpp">tags/Safari-604.1.25.0.2/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60412502SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.25.0.2/Source/WebKit2/ChangeLog (218212 => 218213)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.25.0.2/Source/WebKit2/ChangeLog        2017-06-13 22:17:58 UTC (rev 218212)
+++ tags/Safari-604.1.25.0.2/Source/WebKit2/ChangeLog   2017-06-13 22:21:11 UTC (rev 218213)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-06-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r218121.
+
+    2017-06-12  Chris Dumez  <cdumez@apple.com>
+
+            Regression(r217867): Legacy SessionHistoryEntryData format should not change
+            https://bugs.webkit.org/show_bug.cgi?id=173267
+            <rdar://problem/32701257>
+
+            Reviewed by Simon Fraser.
+
+            Revert changes to Legacy SessionHistoryEntryData format that were made in r217867,
+            as this apparently breaks compatiblity.
+
+            * UIProcess/mac/LegacySessionStateCoding.cpp:
+            (WebKit::encodeFrameStateNode):
+            (WebKit::decodeBackForwardTreeNode):
+
</ins><span class="cx"> 2017-06-09  Daewoong Jang  <daewoong.jang@navercorp.com>
</span><span class="cx"> 
</span><span class="cx">         Use WTF::getCurrentProcessID() instead of getpid()
</span></span></pre></div>
<a id="tagsSafari60412502SourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.25.0.2/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (218212 => 218213)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.25.0.2/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp       2017-06-13 22:17:58 UTC (rev 218212)
+++ tags/Safari-604.1.25.0.2/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp  2017-06-13 22:21:11 UTC (rev 218213)
</span><span class="lines">@@ -346,7 +346,6 @@
</span><span class="cx">     encoder << frameState.scrollPosition.x();
</span><span class="cx">     encoder << frameState.scrollPosition.y();
</span><span class="cx"> 
</span><del>-    encoder << frameState.shouldRestoreScrollPosition;
</del><span class="cx">     encoder << frameState.pageScaleFactor;
</span><span class="cx"> 
</span><span class="cx">     encoder << !!frameState.stateObjectData;
</span><span class="lines">@@ -929,7 +928,6 @@
</span><span class="cx"> 
</span><span class="cx">     frameState.scrollPosition = WebCore::IntPoint(scrollPositionX, scrollPositionY);
</span><span class="cx"> 
</span><del>-    decoder >> frameState.shouldRestoreScrollPosition;
</del><span class="cx">     decoder >> frameState.pageScaleFactor;
</span><span class="cx"> 
</span><span class="cx">     bool hasStateObject;
</span></span></pre></div>
<a id="tagsSafari60412502ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.25.0.2/Tools/ChangeLog (218212 => 218213)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.25.0.2/Tools/ChangeLog 2017-06-13 22:17:58 UTC (rev 218212)
+++ tags/Safari-604.1.25.0.2/Tools/ChangeLog    2017-06-13 22:21:11 UTC (rev 218213)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-06-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r218121.
+
+    2017-06-12  Chris Dumez  <cdumez@apple.com>
+
+            Regression(r217867): Legacy SessionHistoryEntryData format should not change
+            https://bugs.webkit.org/show_bug.cgi?id=173267
+            <rdar://problem/32701257>
+
+            Reviewed by Simon Fraser.
+
+            Restrict test to stop covering saving / restore of scrollRestoration via the legacy
+            SessionHistoryEntryData. Maintain coverage for the default value of scrollRestoration
+            though as this covers the crash that r217867 was fixing.
+
+            * TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp:
+            (TestWebKitAPI::createSessionStateData):
+            (TestWebKitAPI::TEST):
+            (TestWebKitAPI::createSessionStateDataContainingScrollRestoration): Deleted.
+
</ins><span class="cx"> 2017-06-09  Zan Dobersek  <zdobersek@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] Enable ENCRYPTED_MEDIA for build-webkit builds
</span></span></pre></div>
<a id="tagsSafari60412502ToolsTestWebKitAPITestsWebKit2RestoreSessionStatecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.25.0.2/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp (218212 => 218213)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.25.0.2/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp       2017-06-13 22:17:58 UTC (rev 218212)
+++ tags/Safari-604.1.25.0.2/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionState.cpp  2017-06-13 22:21:11 UTC (rev 218213)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     WKPageSetPageLoaderClient(page, &loaderClient.base);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static WKRetainPtr<WKDataRef> createSessionStateDataContainingScrollRestoration(WKContextRef context, std::function<void(WKPageRef)> apply)
</del><ins>+static WKRetainPtr<WKDataRef> createSessionStateData(WKContextRef context)
</ins><span class="cx"> {
</span><span class="cx">     PlatformWebView webView(context);
</span><span class="cx">     setPageLoaderClient(webView.page());
</span><span class="lines">@@ -62,52 +62,10 @@
</span><span class="cx">     Util::run(&didFinishLoad);
</span><span class="cx">     didFinishLoad = false;
</span><span class="cx"> 
</span><del>-    apply(webView.page());
-
</del><span class="cx">     auto sessionState = adoptWK(static_cast<WKSessionStateRef>(WKPageCopySessionState(webView.page(), reinterpret_cast<void*>(1), nullptr)));
</span><span class="cx">     return adoptWK(WKSessionStateCopyData(sessionState.get()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TEST(WebKit2, RestoreSessionStateContainingScrollRestorationManual)
-{
-    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
-
-    PlatformWebView webView(context.get());
-    setPageLoaderClient(webView.page());
-
-    WKRetainPtr<WKDataRef> data = createSessionStateDataContainingScrollRestoration(context.get(), [](WKPageRef page) {
-        EXPECT_JS_EQ(page, "history.scrollRestoration = 'manual'", "manual");
-    });
-    EXPECT_NOT_NULL(data);
-
-    auto sessionState = adoptWK(WKSessionStateCreateFromData(data.get()));
-    WKPageRestoreFromSessionState(webView.page(), sessionState.get());
-
-    Util::run(&didFinishLoad);
-
-    EXPECT_JS_EQ(webView.page(), "history.scrollRestoration", "manual");
-}
-
-TEST(WebKit2, RestoreSessionStateContainingScrollRestorationAuto)
-{
-    WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
-
-    PlatformWebView webView(context.get());
-    setPageLoaderClient(webView.page());
-
-    WKRetainPtr<WKDataRef> data = createSessionStateDataContainingScrollRestoration(context.get(), [](WKPageRef page) {
-        EXPECT_JS_EQ(page, "history.scrollRestoration = 'auto'", "auto");
-    });
-    EXPECT_NOT_NULL(data);
-
-    auto sessionState = adoptWK(WKSessionStateCreateFromData(data.get()));
-    WKPageRestoreFromSessionState(webView.page(), sessionState.get());
-
-    Util::run(&didFinishLoad);
-
-    EXPECT_JS_EQ(webView.page(), "history.scrollRestoration", "auto");
-}
-
</del><span class="cx"> TEST(WebKit2, RestoreSessionStateContainingScrollRestorationDefault)
</span><span class="cx"> {
</span><span class="cx">     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><span class="lines">@@ -115,8 +73,7 @@
</span><span class="cx">     PlatformWebView webView(context.get());
</span><span class="cx">     setPageLoaderClient(webView.page());
</span><span class="cx"> 
</span><del>-    WKRetainPtr<WKDataRef> data = createSessionStateDataContainingScrollRestoration(context.get(), [](WKPageRef) {
-    });
</del><ins>+    WKRetainPtr<WKDataRef> data = createSessionStateData(context.get());
</ins><span class="cx">     EXPECT_NOT_NULL(data);
</span><span class="cx"> 
</span><span class="cx">     auto sessionState = adoptWK(WKSessionStateCreateFromData(data.get()));
</span></span></pre>
</div>
</div>

</body>
</html>