<!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>[170716] trunk/Source/WebKit2</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/170716">170716</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-02 13:19:06 -0700 (Wed, 02 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use legacy state coding directly in WKWebView
https://bugs.webkit.org/show_bug.cgi?id=134553

Reviewed by Dan Bernstein.

* UIProcess/API/C/WKPage.cpp:
(WKPageRestoreFromSessionState):
* UIProcess/API/C/WKSessionStateRef.cpp:
(WKSessionStateCreateFromData):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _sessionStateData]):
(-[WKWebView _sessionState]):
(-[WKWebView _restoreFromSessionStateData:]):
(-[WKWebView _restoreFromSessionState:]):
(releaseNSData): Deleted.
* UIProcess/LegacySessionStateCoding.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreFromSessionState):
(WebKit::WebPageProxy::restoreFromState): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeLegacySessionState):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKSessionStateRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLegacySessionStateCodingh">trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp">trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/ChangeLog        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-07-02  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Use legacy state coding directly in WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=134553
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageRestoreFromSessionState):
+        * UIProcess/API/C/WKSessionStateRef.cpp:
+        (WKSessionStateCreateFromData):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _sessionStateData]):
+        (-[WKWebView _sessionState]):
+        (-[WKWebView _restoreFromSessionStateData:]):
+        (-[WKWebView _restoreFromSessionState:]):
+        (releaseNSData): Deleted.
+        * UIProcess/LegacySessionStateCoding.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::restoreFromSessionState):
+        (WebKit::WebPageProxy::restoreFromState): Deleted.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/mac/LegacySessionStateCoding.cpp:
+        (WebKit::decodeLegacySessionState):
+
+2014-07-02  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Add -[WKWebView _sessionStateData] and -[WKWebView _restoreFromSessionStateData:]
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=134549
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: This is for backwards compatibility with Safari. Remove it once Safari no longer depends on it.
</span><span class="cx">     if (toImpl(sessionStateRef)-&gt;type() == API::Object::Type::Data) {
</span><del>-        if (!decodeLegacySessionState(*toImpl(static_cast&lt;WKDataRef&gt;(sessionStateRef)), sessionState))
</del><ins>+        if (!decodeLegacySessionState(toImpl(static_cast&lt;WKDataRef&gt;(sessionStateRef))-&gt;bytes(), toImpl(static_cast&lt;WKDataRef&gt;(sessionStateRef))-&gt;size(), sessionState))
</ins><span class="cx">             return;
</span><span class="cx">     } else {
</span><span class="cx">         ASSERT(toImpl(sessionStateRef)-&gt;type() == API::Object::Type::SessionState);
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx">         sessionState = toImpl(static_cast&lt;WKSessionStateRef&gt;(sessionStateRef))-&gt;sessionState();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    toImpl(pageRef)-&gt;restoreFromState(std::move(sessionState));
</del><ins>+    toImpl(pageRef)-&gt;restoreFromSessionState(std::move(sessionState));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> double WKPageGetTextZoomFactor(WKPageRef pageRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKSessionStateRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> WKSessionStateRef WKSessionStateCreateFromData(WKDataRef data)
</span><span class="cx"> {
</span><span class="cx">     WebKit::SessionState sessionState;
</span><del>-    if (!WebKit::decodeLegacySessionState(*WebKit::toImpl(data), sessionState))
</del><ins>+    if (!WebKit::decodeLegacySessionState(WebKit::toImpl(data)-&gt;bytes(), WebKit::toImpl(data)-&gt;size(), sessionState))
</ins><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     return WebKit::toAPI(API::SessionState::create(std::move(sessionState)).leakRef());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import &quot;APIFormClient.h&quot;
</span><span class="cx"> #import &quot;FindClient.h&quot;
</span><ins>+#import &quot;LegacySessionStateCoding.h&quot;
</ins><span class="cx"> #import &quot;NavigationState.h&quot;
</span><span class="cx"> #import &quot;RemoteLayerTreeTransaction.h&quot;
</span><span class="cx"> #import &quot;RemoteObjectRegistry.h&quot;
</span><span class="lines">@@ -1564,30 +1565,36 @@
</span><span class="cx"> 
</span><span class="cx"> - (NSData *)_sessionStateData
</span><span class="cx"> {
</span><del>-    return [self _sessionState];
</del><ins>+    WebKit::SessionState sessionState = _page-&gt;sessionState();
+
+    // FIXME: This should not use the legacy session state encoder.
+    return [wrapper(*WebKit::encodeLegacySessionState(sessionState).release().leakRef()) autorelease];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME: This should return a _WKSessionState object.
</ins><span class="cx"> - (NSData *)_sessionState
</span><span class="cx"> {
</span><del>-    return [wrapper(*_page-&gt;sessionStateData(nullptr).leakRef()) autorelease];
</del><ins>+    return [self _sessionStateData];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void releaseNSData(unsigned char*, const void* data)
</del><ins>+- (void)_restoreFromSessionStateData:(NSData *)sessionStateData
</ins><span class="cx"> {
</span><del>-    [(NSData *)data release];
-}
</del><ins>+    // FIXME: This should not use the legacy session state decoder.
+    WebKit::SessionState sessionState;
+    if (!WebKit::decodeLegacySessionState(static_cast&lt;const uint8_t*&gt;(sessionStateData.bytes), sessionStateData.length, sessionState))
+        return;
</ins><span class="cx"> 
</span><del>-- (void)_restoreFromSessionStateData:(NSData *)sessionState
-{
-    [self _restoreFromSessionState:sessionState];
</del><ins>+    uint64_t navigationID = _page-&gt;restoreFromSessionState(std::move(sessionState));
+    if (navigationID) {
+        // FIXME: This is not necessarily always a reload navigation.
+        _navigationState-&gt;createReloadNavigation(navigationID);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME: This should take a _WKSessionState object.
</ins><span class="cx"> - (void)_restoreFromSessionState:(NSData *)sessionStateData
</span><span class="cx"> {
</span><del>-    [sessionStateData retain];
-    uint64_t navigationID = _page-&gt;restoreFromSessionStateData(API::Data::createWithoutCopying((const unsigned char*)sessionStateData.bytes, sessionStateData.length, releaseNSData, sessionStateData).get());
-    if (navigationID)
-        _navigationState-&gt;createReloadNavigation(navigationID);
</del><ins>+    [self _restoreFromSessionStateData:sessionStateData];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)_close
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> RefPtr&lt;API::Data&gt; encodeLegacySessionState(const SessionState&amp;);
</span><span class="cx"> RefPtr&lt;API::Data&gt; encodeLegacySessionHistoryEntryData(const FrameState&amp;);
</span><span class="cx"> 
</span><del>-bool decodeLegacySessionState(const API::Data&amp;, SessionState&amp;);
</del><ins>+bool decodeLegacySessionState(const uint8_t* data, size_t, SessionState&amp;);
</ins><span class="cx"> bool decodeLegacySessionHistoryEntryData(const uint8_t* data, size_t, FrameState&amp;);
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -1863,7 +1863,7 @@
</span><span class="cx">     return sessionState;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-uint64_t WebPageProxy::restoreFromState(SessionState sessionState)
</del><ins>+uint64_t WebPageProxy::restoreFromSessionState(SessionState sessionState)
</ins><span class="cx"> {
</span><span class="cx">     bool hasBackForwardList = !!sessionState.backForwardListState.currentIndex;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -550,10 +550,10 @@
</span><span class="cx"> 
</span><span class="cx">     void terminateProcess();
</span><span class="cx"> 
</span><del>-    SessionState sessionState(const std::function&lt;bool (WebBackForwardListItem&amp;)&gt;&amp;) const;
</del><ins>+    SessionState sessionState(const std::function&lt;bool (WebBackForwardListItem&amp;)&gt;&amp; = nullptr) const;
</ins><span class="cx">     PassRefPtr&lt;API::Data&gt; sessionStateData(std::function&lt;bool (WebBackForwardListItem&amp;)&gt;) const;
</span><span class="cx">     uint64_t restoreFromSessionStateData(API::Data*);
</span><del>-    uint64_t restoreFromState(SessionState);
</del><ins>+    uint64_t restoreFromSessionState(SessionState);
</ins><span class="cx"> 
</span><span class="cx">     bool supportsTextZoom() const;
</span><span class="cx">     double textZoomFactor() const { return m_textZoomFactor; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170715 => 170716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp        2014-07-02 19:55:22 UTC (rev 170715)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp        2014-07-02 20:19:06 UTC (rev 170716)
</span><span class="lines">@@ -1072,11 +1072,8 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool decodeLegacySessionState(const API::Data&amp; data, SessionState&amp; sessionState)
</del><ins>+bool decodeLegacySessionState(const uint8_t* bytes, size_t size, SessionState&amp; sessionState)
</ins><span class="cx"> {
</span><del>-    size_t size = data.size();
-    const uint8_t* bytes = data.bytes();
-
</del><span class="cx">     if (size &lt; sizeof(uint32_t))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>