<!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>[170191] 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/170191">170191</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 10:57:45 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin stubbing out new session state classes
https://bugs.webkit.org/show_bug.cgi?id=134110
Reviewed by Geoffrey Garen.
The basic idea is that these classes will replace the data blobs representing HistoryItems
that we currently send back and forth between the web and UI processes.
* Shared/SessionState.cpp: Added.
(WebKit::HTTPBody::Element::Element):
(WebKit::HTTPBody::Element::~Element):
(WebKit::FrameState::FrameState):
(WebKit::FrameState::~FrameState):
(WebKit::PageState::PageState):
(WebKit::PageState::~PageState):
* Shared/SessionState.h: Added.
(WebKit::HTTPBody::Element::type):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedSessionStatecpp">trunk/Source/WebKit2/Shared/SessionState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStateh">trunk/Source/WebKit2/Shared/SessionState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170190 => 170191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-20 17:25:06 UTC (rev 170190)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 17:57:45 UTC (rev 170191)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-06-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Begin stubbing out new session state classes
+ https://bugs.webkit.org/show_bug.cgi?id=134110
+
+ Reviewed by Geoffrey Garen.
+
+ The basic idea is that these classes will replace the data blobs representing HistoryItems
+ that we currently send back and forth between the web and UI processes.
+
+ * Shared/SessionState.cpp: Added.
+ (WebKit::HTTPBody::Element::Element):
+ (WebKit::HTTPBody::Element::~Element):
+ (WebKit::FrameState::FrameState):
+ (WebKit::FrameState::~FrameState):
+ (WebKit::PageState::PageState):
+ (WebKit::PageState::~PageState):
+ * Shared/SessionState.h: Added.
+ (WebKit::HTTPBody::Element::type):
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2014-06-20 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Rename SessionState to LegacySessionState
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134107
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStatecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/SessionState.cpp (0 => 170191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2014-06-20 17:57:45 UTC (rev 170191)
</span><span class="lines">@@ -0,0 +1,56 @@
</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 "SessionState.h"
+
+namespace WebKit {
+
+HTTPBody::Element::Element()
+ : m_type(Type::Data)
+{
+}
+
+HTTPBody::Element::~Element()
+{
+}
+
+FrameState::FrameState()
+{
+}
+
+FrameState::~FrameState()
+{
+}
+
+PageState::PageState()
+{
+}
+
+PageState::~PageState()
+{
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/SessionState.h (0 => 170191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h (rev 0)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2014-06-20 17:57:45 UTC (rev 170191)
</span><span class="lines">@@ -0,0 +1,78 @@
</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 SessionState_h
+#define SessionState_h
+
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+class HTTPBody {
+public:
+ class Element {
+ public:
+ enum class Type {
+ Data,
+ File,
+ Blob,
+ };
+
+ Element();
+ ~Element();
+
+ Type type() const { return m_type; }
+
+ private:
+ Type m_type;
+ };
+
+private:
+ String m_contentType;
+ Vector<Element> m_elements;
+};
+
+class FrameState {
+public:
+ FrameState();
+ ~FrameState();
+
+private:
+ Vector<FrameState> m_children;
+ HTTPBody m_httpBody;
+};
+
+class PageState {
+public:
+ PageState();
+ ~PageState();
+
+ FrameState m_mainFrameState;
+};
+
+} // namespace WebKit
+
+#endif // SessionState_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170190 => 170191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-20 17:25:06 UTC (rev 170190)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-06-20 17:57:45 UTC (rev 170191)
</span><span class="lines">@@ -462,6 +462,8 @@
</span><span class="cx"> 1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD3181891CA1200153970 /* WKPreferences.mm */; };
</span><span class="cx"> 1AFDE64519510B5500C48FFA /* LegacyBundleForClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */; };
</span><ins>+ 1AFDE6591954A42B00C48FFA /* SessionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDE6571954A42B00C48FFA /* SessionState.cpp */; };
+ 1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDE6581954A42B00C48FFA /* SessionState.h */; };
</ins><span class="cx"> 1AFE436518B6C081009C7A48 /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFE436318B6C081009C7A48 /* UIDelegate.mm */; };
</span><span class="cx"> 1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE436418B6C081009C7A48 /* UIDelegate.h */; };
</span><span class="cx"> 1AFF49001833DE78009AB15A /* WKDeprecatedFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */; };
</span><span class="lines">@@ -2418,6 +2420,8 @@
</span><span class="cx"> 1AFDD3161891C94700153970 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFDD3181891CA1200153970 /* WKPreferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPreferences.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AFDE64319510B5500C48FFA /* LegacyBundleForClass.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyBundleForClass.mm; sourceTree = "<group>"; };
</span><ins>+ 1AFDE6571954A42B00C48FFA /* SessionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionState.cpp; sourceTree = "<group>"; };
+ 1AFDE6581954A42B00C48FFA /* SessionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionState.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AFE436318B6C081009C7A48 /* UIDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIDelegate.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AFE436418B6C081009C7A48 /* UIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKDeprecatedFunctions.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4392,6 +4396,8 @@
</span><span class="cx"> 33152974130D0CB200ED2483 /* SecurityOriginData.h */,
</span><span class="cx"> 518D2CC812D51DFB003BB93B /* LegacySessionState.cpp */,
</span><span class="cx"> 518D2CC912D51DFB003BB93B /* LegacySessionState.h */,
</span><ins>+ 1AFDE6571954A42B00C48FFA /* SessionState.cpp */,
+ 1AFDE6581954A42B00C48FFA /* SessionState.h */,
</ins><span class="cx"> 753E3E0B1887397300188496 /* SessionTracker.cpp */,
</span><span class="cx"> 753E3E091887394B00188496 /* SessionTracker.h */,
</span><span class="cx"> 1A6420E212DCE2FF00CAAE2C /* ShareableBitmap.cpp */,
</span><span class="lines">@@ -7674,6 +7680,7 @@
</span><span class="cx"> BC4075FE124FF0270068F20A /* WKMutableArray.h in Headers */,
</span><span class="cx"> BC407600124FF0270068F20A /* WKMutableDictionary.h in Headers */,
</span><span class="cx"> C09AE5E9125257C20025825D /* WKNativeEvent.h in Headers */,
</span><ins>+ 1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */,
</ins><span class="cx"> BCF69FA91176D1CB00471A52 /* WKNavigationDataRef.h in Headers */,
</span><span class="cx"> 318BE17914743E6F00A8FBB2 /* WKNotification.h in Headers */,
</span><span class="cx"> 3769079A18F31CB2001DFF04 /* APIInjectedBundlePageUIClient.h in Headers */,
</span><span class="lines">@@ -8718,6 +8725,7 @@
</span><span class="cx"> 1A64230812DD09EB00CAAE2C /* DrawingAreaProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */,
</span><span class="cx"> 8CFECE941490F140002AAA32 /* EditorState.cpp in Sources */,
</span><ins>+ 1AFDE6591954A42B00C48FFA /* SessionState.cpp in Sources */,
</ins><span class="cx"> 93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */,
</span><span class="cx"> 2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */,
</span><span class="cx"> 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>