<!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>[191103] 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/191103">191103</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-15 01:18:58 -0700 (Thu, 15 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
https://bugs.webkit.org/show_bug.cgi?id=84960

Reviewed by Žan Doberšek.

Source/WebKit2:

Add a cross-platform implementation to LegacySessionStateCodingNone
using the new SessionState, so that non mac ports can make unit
tests that use the legacy session state coding pass.

* UIProcess/LegacySessionStateCodingNone.cpp:
(WebKit::encodeLegacySessionState):
(WebKit::decodeLegacySessionState):
(WebKit::encodeLegacySessionHistoryEntryData): Deleted.
(WebKit::decodeLegacySessionHistoryEntryData): Deleted.

Tools:

* Scripts/run-gtk-tests:
(TestRunner): Unskip tests using SessionState.
* TestWebKitAPI/PlatformGTK.cmake: Add
WKPageCopySessionStateWithFiltering test.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLegacySessionStateCodingNonecpp">trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrungtktests">trunk/Tools/Scripts/run-gtk-tests</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191102 => 191103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/ChangeLog        2015-10-15 08:18:58 UTC (rev 191103)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-10-15  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+        https://bugs.webkit.org/show_bug.cgi?id=84960
+
+        Reviewed by Žan Doberšek.
+
+        Add a cross-platform implementation to LegacySessionStateCodingNone
+        using the new SessionState, so that non mac ports can make unit
+        tests that use the legacy session state coding pass.
+
+        * UIProcess/LegacySessionStateCodingNone.cpp:
+        (WebKit::encodeLegacySessionState):
+        (WebKit::decodeLegacySessionState):
+        (WebKit::encodeLegacySessionHistoryEntryData): Deleted.
+        (WebKit::decodeLegacySessionHistoryEntryData): Deleted.
+
+2015-10-15  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
</ins><span class="cx">         Unreviewed. Fix wrong #ifdef added in r190615.
</span><span class="cx"> 
</span><span class="cx">         This disabled accelerated compositing unconditionally.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLegacySessionStateCodingNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp (191102 => 191103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp        2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp        2015-10-15 08:18:58 UTC (rev 191103)
</span><span class="lines">@@ -27,33 +27,32 @@
</span><span class="cx"> #include &quot;LegacySessionStateCoding.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;APIData.h&quot;
</span><ins>+#include &quot;ArgumentDecoder.h&quot;
+#include &quot;ArgumentEncoder.h&quot;
</ins><span class="cx"> #include &quot;SessionState.h&quot;
</span><del>-#include &lt;WebCore/NotImplemented.h&gt;
</del><ins>+#include &quot;WebCoreArgumentCoders.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><del>-RefPtr&lt;API::Data&gt; encodeLegacySessionState(const SessionState&amp;)
</del><ins>+RefPtr&lt;API::Data&gt; encodeLegacySessionState(const SessionState&amp; sessionState)
</ins><span class="cx"> {
</span><del>-    notImplemented();
-    return API::Data::create(nullptr, 0);
</del><ins>+    IPC::ArgumentEncoder encoder;
+    encoder &lt;&lt; sessionState.backForwardListState;
+    encoder &lt;&lt; sessionState.renderTreeSize;
+    encoder &lt;&lt; sessionState.provisionalURL;
+    return API::Data::create(encoder.buffer(), encoder.bufferSize());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr&lt;API::Data&gt; encodeLegacySessionHistoryEntryData(const FrameState&amp;)
</del><ins>+bool decodeLegacySessionState(const uint8_t* data, size_t dataSize, SessionState&amp; sessionState)
</ins><span class="cx"> {
</span><del>-    notImplemented();
-    return API::Data::create(nullptr, 0);
</del><ins>+    IPC::ArgumentDecoder decoder(data, dataSize);
+    if (!decoder.decode(sessionState.backForwardListState))
+        return false;
+    if (!decoder.decode(sessionState.renderTreeSize))
+        return false;
+    if (!decoder.decode(sessionState.provisionalURL))
+        return false;
+    return true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool decodeLegacySessionState(const uint8_t*, size_t, SessionState&amp;)
-{
-    notImplemented();
-    return false;
-}
-
-bool decodeLegacySessionHistoryEntryData(const uint8_t*, size_t, FrameState&amp;)
-{
-    notImplemented();
-    return false;
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191102 => 191103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/ChangeLog        2015-10-15 08:18:58 UTC (rev 191103)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-15  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+        https://bugs.webkit.org/show_bug.cgi?id=84960
+
+        Reviewed by Žan Doberšek.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Unskip tests using SessionState.
+        * TestWebKitAPI/PlatformGTK.cmake: Add
+        WKPageCopySessionStateWithFiltering test.
+
</ins><span class="cx"> 2015-10-14  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Missing return value on TestWebExtensions.cpp:193
</span></span></pre></div>
<a id="trunkToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-gtk-tests (191102 => 191103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-gtk-tests        2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/Scripts/run-gtk-tests        2015-10-15 08:18:58 UTC (rev 191103)
</span><span class="lines">@@ -68,10 +68,8 @@
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.MouseMoveAfterCrash&quot;, &quot;Test is flaky&quot;, 85066),
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.NewFirstVisuallyNonEmptyLayoutForImages&quot;, &quot;Test is flaky&quot;, 85066),
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.NewFirstVisuallyNonEmptyLayoutFrames&quot;, &quot;Test fails&quot;, 85037),
</span><del>-        SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.RestoreSessionStateContainingFormData&quot;, &quot;Session State is not implemented in GTK+ port&quot;, 84960),
</del><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.SpacebarScrolling&quot;, &quot;Test fails&quot;, 84961),
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.WKConnection&quot;, &quot;Tests fail and time out out&quot;, 84959),
</span><del>-        SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.WKPageGetScaleFactorNotZero&quot;, &quot;Test fails and times out&quot;, 88455),
</del><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.ForceRepaint&quot;, &quot;Test times out&quot;, 105532),
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.ReloadPageAfterCrash&quot;, &quot;Test flakily times out&quot;, 110129),
</span><span class="cx">         SkippedTest(&quot;WebKit2/TestWebKit2&quot;, &quot;WebKit2.DidAssociateFormControls&quot;, &quot;Test times out&quot;, 120302),
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (191102 => 191103)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake        2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake        2015-10-15 08:18:58 UTC (rev 191103)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMedia.cpp
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage.cpp
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent.cpp
</span><ins>+    ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageCopySessionStateWithFiltering.cpp
</ins><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPreferences.cpp
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKRetainPtr.cpp
</span></span></pre>
</div>
</div>

</body>
</html>