<!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>[170262] 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/170262">170262</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-22 09:34:15 -0700 (Sun, 22 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement the rest of back forward tree decoding
https://bugs.webkit.org/show_bug.cgi?id=134166
Reviewed by Sam Weinig.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataDecoder::operator>>):
(WebKit::decodeFormDataElement):
(WebKit::decodeFormData):
(WebKit::decodeBackForwardTreeNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (170261 => 170262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-22 16:33:40 UTC (rev 170261)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-22 16:34:15 UTC (rev 170262)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-21 Anders Carlsson <andersca@apple.com>
+
+ Implement the rest of back forward tree decoding
+ https://bugs.webkit.org/show_bug.cgi?id=134166
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/mac/LegacySessionStateCoding.cpp:
+ (WebKit::HistoryEntryDataDecoder::operator>>):
+ (WebKit::decodeFormDataElement):
+ (WebKit::decodeFormData):
+ (WebKit::decodeBackForwardTreeNode):
+
</ins><span class="cx"> 2014-06-22 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WKWebViewConfiguration.allowsInlineMediaPlayback has no effect
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacLegacySessionStateCodingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170261 => 170262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-22 16:33:40 UTC (rev 170261)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-06-22 16:34:15 UTC (rev 170262)
</span><span class="lines">@@ -241,6 +241,11 @@
</span><span class="cx"> return decodeArithmeticType(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ HistoryEntryDataDecoder& operator>>(double& value)
+ {
+ return decodeArithmeticType(value);
+ }
+
</ins><span class="cx"> HistoryEntryDataDecoder& operator>>(String& value)
</span><span class="cx"> {
</span><span class="cx"> value = String();
</span><span class="lines">@@ -426,10 +431,40 @@
</span><span class="cx"> decoder >> formDataElement.data;
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case FormDataElementType::EncodedFile:
</del><ins>+ case FormDataElementType::EncodedFile: {
+ decoder >> formDataElement.filePath;
+
+ String generatedFilename;
+ decoder >> generatedFilename;
+
+ bool shouldGenerateFile;
+ decoder >> shouldGenerateFile;
+
+ decoder >> formDataElement.fileStart;
+ if (formDataElement.fileStart < 0)
+ return;
+
+ int64_t fileLength;
+ decoder >> fileLength;
+ if (fileLength != -1) {
+ if (fileLength < formDataElement.fileStart)
+ return;
+
+ formDataElement.fileLength = fileLength;
+ }
+
+
+ double expectedFileModificationTime;
+ decoder >> expectedFileModificationTime;
+ if (expectedFileModificationTime != std::numeric_limits<double>::quiet_NaN())
+ formDataElement.expectedFileModificationTime = expectedFileModificationTime;
+
+ break;
+ }
+
</ins><span class="cx"> case FormDataElementType::EncodedBlob:
</span><del>- // FIXME: Implement.
- ASSERT_NOT_REACHED();
</del><ins>+ decoder >> formDataElement.blobURLString;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -450,6 +485,12 @@
</span><span class="cx">
</span><span class="cx"> formData.elements.append(std::move(formDataElement));
</span><span class="cx"> }
</span><ins>+
+ bool hasGeneratedFiles;
+ decoder >> hasGeneratedFiles;
+
+ int64_t identifier;
+ decoder >> identifier;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void decodeBackForwardTreeNode(HistoryEntryDataDecoder& decoder, FrameState& frameState)
</span><span class="lines">@@ -472,8 +513,10 @@
</span><span class="cx"> decoder >> documentStateVectorSize;
</span><span class="cx">
</span><span class="cx"> for (uint64_t i = 0; i < documentStateVectorSize; ++i) {
</span><del>- // FIXME: Implement.
- ASSERT_NOT_REACHED();
</del><ins>+ String state;
+ decoder >> state;
+
+ frameState.documentState.append(std::move(state));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String formContentType;
</span><span class="lines">@@ -508,10 +551,8 @@
</span><span class="cx"> bool hasStateObject;
</span><span class="cx"> decoder >> hasStateObject;
</span><span class="cx">
</span><del>- if (hasStateObject) {
- // FIXME: Implement.
- ASSERT_NOT_REACHED();
- }
</del><ins>+ if (hasStateObject)
+ decoder >> frameState.stateObjectData;
</ins><span class="cx">
</span><span class="cx"> decoder >> frameState.target;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>