<!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>[170854] 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/170854">170854</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-07 13:28:13 -0700 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a stubbed out _WKSessionState class
https://bugs.webkit.org/show_bug.cgi?id=134690
Reviewed by Geoffrey Garen.
* UIProcess/API/Cocoa/_WKSessionState.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
* UIProcess/API/Cocoa/_WKSessionState.mm: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
(-[_WKSessionState initWithData:]):
(-[_WKSessionState data]):
* UIProcess/API/Cocoa/_WKSessionStateInternal.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
* UIProcess/Cocoa/SessionStateCoding.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
* UIProcess/Cocoa/SessionStateCoding.mm: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
(WebKit::encodeSessionState):
(WebKit::decodeSessionState):
* UIProcess/LegacySessionStateCoding.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLegacySessionStateCodingh">trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSessionStateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSessionStatemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKSessionStateInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionStateInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaSessionStateCodingh">trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaSessionStateCodingmm">trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170853 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-07 19:52:26 UTC (rev 170853)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-07-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add a stubbed out _WKSessionState class
+ https://bugs.webkit.org/show_bug.cgi?id=134690
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/API/Cocoa/_WKSessionState.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
+ * UIProcess/API/Cocoa/_WKSessionState.mm: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
+ (-[_WKSessionState initWithData:]):
+ (-[_WKSessionState data]):
+ * UIProcess/API/Cocoa/_WKSessionStateInternal.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
+ * UIProcess/Cocoa/SessionStateCoding.h: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
+ * UIProcess/Cocoa/SessionStateCoding.mm: Copied from Source/WebKit2/UIProcess/LegacySessionStateCoding.h.
+ (WebKit::encodeSessionState):
+ (WebKit::decodeSessionState):
+ * UIProcess/LegacySessionStateCoding.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2014-07-07 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Some of the WKPreferences (API) property getters read like questions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134678
</span><span class="cx"> <rdar://problem/17576847>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSessionStatehfromrev170853trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.h (from rev 170853, trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h) (0 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.h 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_CLASS_AVAILABLE(10_10, 8_0)
+@interface _WKSessionState : NSObject
+
+- (instancetype)initWithData:(NSData *)data;
+
+@property (nonatomic, readonly, copy) NSData *data;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSessionStatemmfromrev170853trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.mm (from rev 170853, trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h) (0 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionState.mm 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKSessionStateInternal.h"
+
+#if WK_API_ENABLED
+
+#import "SessionStateCoding.h"
+
+@implementation _WKSessionState
+
+- (instancetype)initWithData:(NSData *)data
+{
+ if (!(self = [super init]))
+ return nil;
+
+ if (!WebKit::decodeSessionState(data, _sessionState)) {
+ [self release];
+ return nil;
+ }
+
+ return self;
+}
+
+- (NSData *)data
+{
+ return WebKit::encodeSessionState(_sessionState).autorelease();
+}
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKSessionStateInternalhfromrev170853trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionStateInternal.h (from rev 170853, trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h) (0 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionStateInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKSessionStateInternal.h 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKSessionState.h"
+
+#if WK_API_ENABLED
+
+#import "SessionState.h"
+
+@interface _WKSessionState () {
+ WebKit::SessionState _sessionState;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaSessionStateCodinghfromrev170853trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.h (from rev 170853, trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h) (0 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.h 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SessionStateCoding_h
+#define SessionStateCoding_h
+
+#import <wtf/RetainPtr.h>
+
+namespace WebKit {
+
+struct FrameState;
+struct SessionState;
+
+RetainPtr<NSData> encodeSessionState(const SessionState&);
+bool decodeSessionState(NSData *, SessionState&);
+
+}
+
+#endif // SessionStateCoding_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaSessionStateCodingmmfromrev170853trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm (from rev 170853, trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h) (0 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "SessionStateCoding.h"
+
+namespace WebKit {
+
+RetainPtr<NSData> encodeSessionState(const SessionState&)
+{
+ // FIXME: Implement.
+ return nullptr;
+}
+
+bool decodeSessionState(NSData *, SessionState&)
+{
+ // FIXME: Implement.
+ return false;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLegacySessionStateCodingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h (170853 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-07 19:52:26 UTC (rev 170853)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef LegacySessionStateCoding_h
</span><span class="cx"> #define LegacySessionStateCoding_h
</span><span class="cx">
</span><del>-#include <wtf/Vector.h>
</del><ins>+#include <wtf/Forward.h>
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Data;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170853 => 170854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-07 19:52:26 UTC (rev 170853)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-07 20:28:13 UTC (rev 170854)
</span><span class="lines">@@ -109,6 +109,11 @@
</span><span class="cx"> 0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
</span><span class="cx"> 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
</span><span class="cx"> 0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
</span><ins>+ 1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */; };
+ 1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D3F196B329400B9AD44 /* _WKSessionState.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */; };
+ 1A002D48196B345D00B9AD44 /* SessionStateCoding.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */; };
+ 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */; };
</ins><span class="cx"> 1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043974124D034800FFBFB5 /* PluginProcess.h */; };
</span><span class="cx"> 1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043975124D034800FFBFB5 /* PluginProcess.cpp */; };
</span><span class="cx"> 1A043A09124D11A900FFBFB5 /* WebProcessConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043A07124D11A900FFBFB5 /* WebProcessConnection.h */; };
</span><span class="lines">@@ -2034,6 +2039,11 @@
</span><span class="cx"> 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDrawingAreaProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FF24A2F1879E4FE003ABF0C /* RemoteLayerTreeDrawingAreaProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteLayerTreeDrawingAreaProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
</span><ins>+ 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKSessionState.mm; sourceTree = "<group>"; };
+ 1A002D3F196B329400B9AD44 /* _WKSessionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSessionState.h; sourceTree = "<group>"; };
+ 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKSessionStateInternal.h; sourceTree = "<group>"; };
+ 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SessionStateCoding.mm; sourceTree = "<group>"; };
+ 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionStateCoding.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A043974124D034800FFBFB5 /* PluginProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcess.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A043975124D034800FFBFB5 /* PluginProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcess.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A043A07124D11A900FFBFB5 /* WebProcessConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessConnection.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4580,6 +4590,9 @@
</span><span class="cx"> 0F0C365918C0555800F607D7 /* LayerRepresentation.h */,
</span><span class="cx"> 1ABC3DF41899E437004F0626 /* NavigationState.h */,
</span><span class="cx"> 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
</span><ins>+ 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */,
+ 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */,
+ 517DD5BB180DA7C40081660B /* Databases */,
</ins><span class="cx"> 1AFE436418B6C081009C7A48 /* UIDelegate.h */,
</span><span class="cx"> 1AFE436318B6C081009C7A48 /* UIDelegate.mm */,
</span><span class="cx"> 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */,
</span><span class="lines">@@ -4974,6 +4987,9 @@
</span><span class="cx"> 376C51181957452E0007B0FA /* _WKSecurityOrigin.h */,
</span><span class="cx"> 376C51171957452E0007B0FA /* _WKSecurityOrigin.mm */,
</span><span class="cx"> 376C511B195748C20007B0FA /* _WKSecurityOriginInternal.h */,
</span><ins>+ 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */,
+ 1A002D3F196B329400B9AD44 /* _WKSessionState.h */,
+ 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */,
</ins><span class="cx"> 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
</span><span class="cx"> 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
</span><span class="cx"> 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
</span><span class="lines">@@ -5282,6 +5298,7 @@
</span><span class="cx"> 512A9766180E05D20039A149 /* DatabaseProcessProxy.messages.in */,
</span><span class="cx"> );
</span><span class="cx"> name = Databases;
</span><ins>+ path = ..;
</ins><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><span class="cx"> 517DD5C0180DB7AA0081660B /* mac */ = {
</span><span class="lines">@@ -5719,7 +5736,6 @@
</span><span class="cx"> BC032DC410F4387C0058C15A /* API */,
</span><span class="cx"> 512F588D12A8836F00629530 /* Authentication */,
</span><span class="cx"> 1ABC3DF21899E415004F0626 /* Cocoa */,
</span><del>- 517DD5BB180DA7C40081660B /* Databases */,
</del><span class="cx"> 1AB7D4C71288AA9A00CFD08C /* Downloads */,
</span><span class="cx"> BC111B18112F5FB400337BAB /* Launcher */,
</span><span class="cx"> BCCF085C113F3B7500C650C5 /* mac */,
</span><span class="lines">@@ -7494,6 +7510,7 @@
</span><span class="cx"> 33D3A3BB1339606200709BE4 /* WebMediaCacheManagerProxy.h in Headers */,
</span><span class="cx"> 0F5947A4187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h in Headers */,
</span><span class="cx"> 33D3A3CB1339617900709BE4 /* WebMediaCacheManagerProxyMessages.h in Headers */,
</span><ins>+ 1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */,
</ins><span class="cx"> 909854ED12BC4E18000AD080 /* WebMemorySampler.h in Headers */,
</span><span class="cx"> BCF69FA21176D01400471A52 /* APINavigationData.h in Headers */,
</span><span class="cx"> BCF69F9A1176CED600471A52 /* WebNavigationDataStore.h in Headers */,
</span><span class="lines">@@ -7561,6 +7578,7 @@
</span><span class="cx"> 510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
</span><span class="cx"> 51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
</span><span class="cx"> 1AAF08A4192682DA00B6390C /* WKUserContentControllerInternal.h in Headers */,
</span><ins>+ 1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */,
</ins><span class="cx"> D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
</span><span class="cx"> 1FB00AC9185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h in Headers */,
</span><span class="cx"> F634445612A885C8000612D8 /* WebSecurityOrigin.h in Headers */,
</span><span class="lines">@@ -7661,6 +7679,7 @@
</span><span class="cx"> 370F34A31829BE1E009027C8 /* WKNavigationData.h in Headers */,
</span><span class="cx"> 1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */,
</span><span class="cx"> 1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */,
</span><ins>+ 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
</ins><span class="cx"> BC4075FC124FF0270068F20A /* WKErrorRef.h in Headers */,
</span><span class="cx"> BCFD548C132D82680055D816 /* WKErrorCF.h in Headers */,
</span><span class="cx"> BC40783D1250FADD0068F20A /* WKEvent.h in Headers */,
</span><span class="lines">@@ -9086,6 +9105,7 @@
</span><span class="cx"> 939AE7661316E99C00AE06A6 /* WebCoreArgumentCoders.cpp in Sources */,
</span><span class="cx"> BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */,
</span><span class="cx"> 512F589A12A8838800629530 /* WebCredential.cpp in Sources */,
</span><ins>+ 1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */,
</ins><span class="cx"> F6A25FDC12ADC6CC00DC40CC /* WebDatabaseManager.cpp in Sources */,
</span><span class="cx"> F62A76B612B1B25F0005F1B6 /* WebDatabaseManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */,
</span><span class="lines">@@ -9227,6 +9247,7 @@
</span><span class="cx"> BC111AE4112F5C2600337BAB /* WebProcess.cpp in Sources */,
</span><span class="cx"> 1A043A0A124D11A900FFBFB5 /* WebProcessConnection.cpp in Sources */,
</span><span class="cx"> 1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */,
</span><ins>+ 1A002D48196B345D00B9AD44 /* SessionStateCoding.mm in Sources */,
</ins><span class="cx"> BC306825125A6B9400E71278 /* WebProcessCreationParameters.cpp in Sources */,
</span><span class="cx"> 1F7506B01859162C00EC0FF7 /* WKWebProcessPlugInScriptWorld.mm in Sources */,
</span><span class="cx"> 75E749EB180DBB9800088BA6 /* WebOriginDataManagerProxyMessageReceiver.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>