<!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>[170387] 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/170387">170387</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 13:40:59 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add code to convert HistoryItem to PageState
https://bugs.webkit.org/show_bug.cgi?id=134263
Reviewed by Andreas Kling.
* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toHTTPBody):
(WebKit::toFrameState):
(WebKit::toPageState):
* WebProcess/WebCoreSupport/SessionStateConversion.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversionh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170386 => 170387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-24 20:40:59 UTC (rev 170387)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-24 Anders Carlsson <andersca@apple.com>
+
+ Add code to convert HistoryItem to PageState
+ https://bugs.webkit.org/show_bug.cgi?id=134263
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+ (WebKit::toHTTPBody):
+ (WebKit::toFrameState):
+ (WebKit::toPageState):
+ * WebProcess/WebCoreSupport/SessionStateConversion.h:
+
</ins><span class="cx"> 2014-06-24 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Disable screen font substitution by default.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp (170386 => 170387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp 2014-06-24 20:40:59 UTC (rev 170387)
</span><span class="lines">@@ -35,6 +35,83 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static HTTPBody toHTTPBody(const FormData& formData)
+{
+ HTTPBody httpBody;
+
+ for (const auto& formDataElement : formData.elements()) {
+ HTTPBody::Element element;
+
+ switch (formDataElement.m_type) {
+ case FormDataElement::Type::Data:
+ element.type = HTTPBody::Element::Type::Data;
+ element.data = formDataElement.m_data;
+ break;
+
+ case FormDataElement::Type::EncodedFile:
+ element.filePath = formDataElement.m_filename;
+ element.fileStart = formDataElement.m_fileStart;
+ if (formDataElement.m_fileLength != BlobDataItem::toEndOfFile)
+ element.fileLength = formDataElement.m_fileLength;
+ if (formDataElement.m_expectedFileModificationTime != invalidFileTime())
+ element.expectedFileModificationTime = formDataElement.m_expectedFileModificationTime;
+ break;
+
+ case FormDataElement::Type::EncodedBlob:
+ element.blobURLString = formDataElement.m_url.string();
+ break;
+ }
+
+ httpBody.elements.append(std::move(element));
+ }
+
+ return httpBody;
+}
+
+static FrameState toFrameState(const HistoryItem& historyItem)
+{
+ FrameState frameState;
+
+ frameState.urlString = historyItem.urlString();
+ frameState.originalURLString = historyItem.originalURLString();
+ frameState.referrer = historyItem.referrer();
+ frameState.target = historyItem.target();
+
+ frameState.documentState = historyItem.documentState();
+ if (RefPtr<SerializedScriptValue> stateObject = historyItem.stateObject())
+ frameState.stateObjectData = stateObject->data();
+
+ frameState.documentSequenceNumber = historyItem.documentSequenceNumber();
+ frameState.itemSequenceNumber = historyItem.itemSequenceNumber();
+
+ frameState.scrollPoint = historyItem.scrollPoint();
+ frameState.pageScaleFactor = historyItem.pageScaleFactor();
+
+ if (FormData* formData = const_cast<HistoryItem&>(historyItem).formData()) {
+ HTTPBody httpBody = toHTTPBody(*formData);
+ httpBody.contentType = historyItem.formContentType();
+
+ frameState.httpBody = std::move(httpBody);
+ }
+
+ for (auto& childHistoryItem : historyItem.children()) {
+ FrameState childFrameState = toFrameState(*childHistoryItem);
+ frameState.children.append(std::move(childFrameState));
+ }
+
+ return frameState;
+}
+
+PageState toPageState(const WebCore::HistoryItem& historyItem)
+{
+ PageState pageState;
+
+ pageState.title = historyItem.title();
+ pageState.mainFrameState = toFrameState(historyItem);
+
+ return pageState;
+}
+
</ins><span class="cx"> static PassRefPtr<FormData> toFormData(const HTTPBody& httpBody)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<FormData> formData = FormData::create();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportSessionStateConversionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h (170386 => 170387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h 2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h 2014-06-24 20:40:59 UTC (rev 170387)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> struct PageState;
</span><span class="cx">
</span><ins>+PageState toPageState(const WebCore::HistoryItem&);
</ins><span class="cx"> PassRefPtr<WebCore::HistoryItem> toHistoryItem(const PageState&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>