<!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>[170210] 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/170210">170210</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 14:55:19 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ArgumentEncoder support to PageState and friends
https://bugs.webkit.org/show_bug.cgi?id=134128
Reviewed by Andreas Kling.
Change the classes to structs, get rid of the constructors/destructors
and add encode member functions.
* Shared/SessionState.cpp:
(WebKit::HTTPBody::Element::encode):
(WebKit::HTTPBody::encode):
(WebKit::FrameState::encode):
(WebKit::PageState::encode):
(WebKit::HTTPBody::Element::Element): Deleted.
(WebKit::HTTPBody::Element::~Element): Deleted.
(WebKit::FrameState::FrameState): Deleted.
(WebKit::FrameState::~FrameState): Deleted.
(WebKit::PageState::PageState): Deleted.
(WebKit::PageState::~PageState): Deleted.
* Shared/SessionState.h:
(WebKit::HTTPBody::Element::type): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<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 (170209 => 170210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-20 21:36:36 UTC (rev 170209)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 21:55:19 UTC (rev 170210)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-06-20 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add ArgumentEncoder support to PageState and friends
+ https://bugs.webkit.org/show_bug.cgi?id=134128
+
+ Reviewed by Andreas Kling.
+
+ Change the classes to structs, get rid of the constructors/destructors
+ and add encode member functions.
+
+ * Shared/SessionState.cpp:
+ (WebKit::HTTPBody::Element::encode):
+ (WebKit::HTTPBody::encode):
+ (WebKit::FrameState::encode):
+ (WebKit::PageState::encode):
+ (WebKit::HTTPBody::Element::Element): Deleted.
+ (WebKit::HTTPBody::Element::~Element): Deleted.
+ (WebKit::FrameState::FrameState): Deleted.
+ (WebKit::FrameState::~FrameState): Deleted.
+ (WebKit::PageState::PageState): Deleted.
+ (WebKit::PageState::~PageState): Deleted.
+ * Shared/SessionState.h:
+ (WebKit::HTTPBody::Element::type): Deleted.
+
+2014-06-20 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add encoding and decoding support for WTF::Optional
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=134125
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (170209 => 170210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.cpp 2014-06-20 21:36:36 UTC (rev 170209)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2014-06-20 21:55:19 UTC (rev 170210)
</span><span class="lines">@@ -26,31 +26,51 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SessionState.h"
</span><span class="cx">
</span><ins>+#include "ArgumentCoders.h"
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-HTTPBody::Element::Element()
- : m_type(Type::Data)
</del><ins>+void HTTPBody::Element::encode(IPC::ArgumentEncoder& encoder) const
</ins><span class="cx"> {
</span><ins>+ encoder.encodeEnum(type);
+ encoder << data;
+ encoder << filePath;
+ encoder << fileStart;
+ encoder << fileLength;
+ encoder << expectedFileModificationTime;
+ encoder << blobURLString;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-HTTPBody::Element::~Element()
</del><ins>+void HTTPBody::encode(IPC::ArgumentEncoder& encoder) const
</ins><span class="cx"> {
</span><ins>+ encoder << contentType;
+ encoder << elements;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FrameState::FrameState()
</del><ins>+void FrameState::encode(IPC::ArgumentEncoder& encoder) const
</ins><span class="cx"> {
</span><del>-}
</del><ins>+ encoder << urlString;
+ encoder << originalURLString;
+ encoder << referrer;
+ encoder << target;
</ins><span class="cx">
</span><del>-FrameState::~FrameState()
-{
-}
</del><ins>+ encoder << documentState;
+ encoder << stateObjectData;
</ins><span class="cx">
</span><del>-PageState::PageState()
-{
</del><ins>+ encoder << documentSequenceNumber;
+ encoder << itemSequenceNumber;
+
+ encoder << scrollPoint;
+ encoder << pageScaleFactor;
+
+ encoder << httpBody;
+
+ encoder << children;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PageState::~PageState()
</del><ins>+void PageState::encode(IPC::ArgumentEncoder& encoder) const
</ins><span class="cx"> {
</span><ins>+ encoder << mainFrameState;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.h (170209 => 170210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h 2014-06-20 21:36:36 UTC (rev 170209)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2014-06-20 21:55:19 UTC (rev 170210)
</span><span class="lines">@@ -26,51 +26,75 @@
</span><span class="cx"> #ifndef SessionState_h
</span><span class="cx"> #define SessionState_h
</span><span class="cx">
</span><ins>+#include <WebCore/IntPoint.h>
+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+namespace IPC {
+class ArgumentDecoder;
+class ArgumentEncoder;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class HTTPBody {
-public:
- class Element {
- public:
</del><ins>+struct HTTPBody {
+ struct Element {
+ void encode(IPC::ArgumentEncoder&) const;
+
</ins><span class="cx"> enum class Type {
</span><span class="cx"> Data,
</span><span class="cx"> File,
</span><span class="cx"> Blob,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- Element();
- ~Element();
</del><ins>+ Type type = Type::Data;
</ins><span class="cx">
</span><del>- Type type() const { return m_type; }
</del><ins>+ // Data.
+ Vector<char> data;
</ins><span class="cx">
</span><del>- private:
- Type m_type;
</del><ins>+ // File.
+ String filePath;
+ int64_t fileStart;
+ Optional<int64_t> fileLength;
+ Optional<double> expectedFileModificationTime;
+
+ // Blob.
+ String blobURLString;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-private:
- String m_contentType;
- Vector<Element> m_elements;
</del><ins>+ void encode(IPC::ArgumentEncoder&) const;
+
+ String contentType;
+ Vector<Element> elements;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class FrameState {
-public:
- FrameState();
- ~FrameState();
</del><ins>+struct FrameState {
+ void encode(IPC::ArgumentEncoder&) const;
</ins><span class="cx">
</span><del>-private:
- Vector<FrameState> m_children;
- HTTPBody m_httpBody;
</del><ins>+ String urlString;
+ String originalURLString;
+ String referrer;
+ String target;
+
+ Vector<String> documentState;
+ Vector<uint8_t> stateObjectData;
+
+ int64_t documentSequenceNumber;
+ int64_t itemSequenceNumber;
+
+ WebCore::IntPoint scrollPoint;
+ float pageScaleFactor;
+
+ Optional<HTTPBody> httpBody;
+
+ Vector<FrameState> children;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class PageState {
-public:
- PageState();
- ~PageState();
</del><ins>+struct PageState {
+ void encode(IPC::ArgumentEncoder&) const;
</ins><span class="cx">
</span><del>- FrameState m_mainFrameState;
</del><ins>+ FrameState mainFrameState;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>