<!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>[172208] 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/172208">172208</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 05:38:30 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move Soup specific code out of WebCoreArgumentCoders.cpp
https://bugs.webkit.org/show_bug.cgi?id=135665
Reviewed by Anders Carlsson.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encode):
(IPC::ArgumentCoder<ResourceRequest>::decode):
(IPC::ArgumentCoder<ResourceError>::encode):
(IPC::ArgumentCoder<ResourceError>::decode):
* Shared/WebCoreArgumentCoders.h:
Soup is the only client for this code. Move it to *Soup.cpp
* Shared/soup/WebCoreArgumentCodersSoup.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
(IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
(IPC::ArgumentCoder<ResourceError>::encodePlatformData):
(IPC::ArgumentCoder<ResourceError>::decodePlatformData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp">trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172207 => 172208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-07 12:08:51 UTC (rev 172207)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-07 12:38:30 UTC (rev 172208)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-06 Antti Koivisto <antti@apple.com>
+
+ Move Soup specific code out of WebCoreArgumentCoders.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=135665
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encode):
+ (IPC::ArgumentCoder<ResourceRequest>::decode):
+ (IPC::ArgumentCoder<ResourceError>::encode):
+ (IPC::ArgumentCoder<ResourceError>::decode):
+ * Shared/WebCoreArgumentCoders.h:
+
+ Soup is the only client for this code. Move it to *Soup.cpp
+
+ * Shared/soup/WebCoreArgumentCodersSoup.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceRequest>::decodePlatformData):
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData):
+ (IPC::ArgumentCoder<ResourceError>::decodePlatformData):
+
</ins><span class="cx"> 2014-08-06 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Services overlay flashes a lot; should have some hysteresis before showing overlay
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (172207 => 172208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-08-07 12:08:51 UTC (rev 172207)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-08-07 12:38:30 UTC (rev 172208)
</span><span class="lines">@@ -632,22 +632,6 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceRequest>::encode(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><del>- if (kShouldSerializeWebCoreData) {
- encoder << resourceRequest.url().string();
- encoder << resourceRequest.httpMethod();
- encoder << resourceRequest.httpHeaderFields();
-
- // FIXME: Do not encode HTTP message body.
- // 1. It can be large and thus costly to send across.
- // 2. It is misleading to provide a body with some requests, while others use body streams, which cannot be serialized at all.
- FormData* httpBody = resourceRequest.httpBody();
- encoder << static_cast<bool>(httpBody);
- if (httpBody)
- encoder << httpBody->flattenToString();
-
- encoder << resourceRequest.firstPartyForCookies().string();
- }
-
</del><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> encoder << resourceRequest.cachePartition();
</span><span class="cx"> #endif
</span><span class="lines">@@ -667,42 +651,6 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><del>- if (kShouldSerializeWebCoreData) {
- ResourceRequest request;
-
- String url;
- if (!decoder.decode(url))
- return false;
- request.setURL(URL(URL(), url));
-
- String httpMethod;
- if (!decoder.decode(httpMethod))
- return false;
- request.setHTTPMethod(httpMethod);
-
- HTTPHeaderMap headers;
- if (!decoder.decode(headers))
- return false;
- request.setHTTPHeaderFields(WTF::move(headers));
-
- bool hasHTTPBody;
- if (!decoder.decode(hasHTTPBody))
- return false;
- if (hasHTTPBody) {
- String httpBody;
- if (!decoder.decode(httpBody))
- return false;
- request.setHTTPBody(FormData::create(httpBody.utf8()));
- }
-
- String firstPartyForCookies;
- if (!decoder.decode(firstPartyForCookies))
- return false;
- request.setFirstPartyForCookies(URL(URL(), firstPartyForCookies));
-
- resourceRequest = request;
- }
-
</del><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> String cachePartition;
</span><span class="cx"> if (!decoder.decode(cachePartition))
</span><span class="lines">@@ -851,63 +799,11 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceError>::encode(ArgumentEncoder& encoder, const ResourceError& resourceError)
</span><span class="cx"> {
</span><del>- if (kShouldSerializeWebCoreData) {
- bool errorIsNull = resourceError.isNull();
- encoder << errorIsNull;
- if (errorIsNull)
- return;
-
- encoder << resourceError.domain();
- encoder << resourceError.errorCode();
- encoder << resourceError.failingURL();
- encoder << resourceError.localizedDescription();
- encoder << resourceError.isCancellation();
- encoder << resourceError.isTimeout();
- }
-
</del><span class="cx"> encodePlatformData(encoder, resourceError);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder& decoder, ResourceError& resourceError)
</span><span class="cx"> {
</span><del>- if (kShouldSerializeWebCoreData) {
- bool errorIsNull;
- if (!decoder.decode(errorIsNull))
- return false;
- if (errorIsNull) {
- resourceError = ResourceError();
- return true;
- }
-
- String domain;
- if (!decoder.decode(domain))
- return false;
-
- int errorCode;
- if (!decoder.decode(errorCode))
- return false;
-
- String failingURL;
- if (!decoder.decode(failingURL))
- return false;
-
- String localizedDescription;
- if (!decoder.decode(localizedDescription))
- return false;
-
- bool isCancellation;
- if (!decoder.decode(isCancellation))
- return false;
-
- bool isTimeout;
- if (!decoder.decode(isTimeout))
- return false;
-
- resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
- resourceError.setIsCancellation(isCancellation);
- resourceError.setIsTimeout(isTimeout);
- }
-
</del><span class="cx"> return decodePlatformData(decoder, resourceError);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (172207 => 172208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-08-07 12:08:51 UTC (rev 172207)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-08-07 12:38:30 UTC (rev 172208)
</span><span class="lines">@@ -245,12 +245,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::ResourceRequest> {
</span><del>-#if PLATFORM(COCOA)
- static const bool kShouldSerializeWebCoreData = false;
-#else
- static const bool kShouldSerializeWebCoreData = true;
-#endif
-
</del><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::ResourceRequest&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::ResourceRequest&);
</span><span class="cx"> static void encodePlatformData(ArgumentEncoder&, const WebCore::ResourceRequest&);
</span><span class="lines">@@ -265,12 +259,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::ResourceError> {
</span><del>-#if PLATFORM(COCOA)
- static const bool kShouldSerializeWebCoreData = false;
-#else
- static const bool kShouldSerializeWebCoreData = true;
-#endif
-
</del><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::ResourceError&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::ResourceError&);
</span><span class="cx"> static void encodePlatformData(ArgumentEncoder&, const WebCore::ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedsoupWebCoreArgumentCodersSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (172207 => 172208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-08-07 12:08:51 UTC (rev 172207)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp 2014-08-07 12:38:30 UTC (rev 172208)
</span><span class="lines">@@ -41,12 +41,56 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><ins>+ encoder << resourceRequest.url().string();
+ encoder << resourceRequest.httpMethod();
+ encoder << resourceRequest.httpHeaderFields();
+
+ // FIXME: Do not encode HTTP message body.
+ // 1. It can be large and thus costly to send across.
+ // 2. It is misleading to provide a body with some requests, while others use body streams, which cannot be serialized at all.
+ FormData* httpBody = resourceRequest.httpBody();
+ encoder << static_cast<bool>(httpBody);
+ if (httpBody)
+ encoder << httpBody->flattenToString();
+
+ encoder << resourceRequest.firstPartyForCookies().string();
+
</ins><span class="cx"> encoder << static_cast<uint32_t>(resourceRequest.soupMessageFlags());
</span><span class="cx"> encoder << resourceRequest.initiatingPageID();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
</span><span class="cx"> {
</span><ins>+ String url;
+ if (!decoder.decode(url))
+ return false;
+ resourceRequest.setURL(URL(URL(), url));
+
+ String httpMethod;
+ if (!decoder.decode(httpMethod))
+ return false;
+ resourceRequest.setHTTPMethod(httpMethod);
+
+ HTTPHeaderMap headers;
+ if (!decoder.decode(headers))
+ return false;
+ resourceRequest.setHTTPHeaderFields(WTF::move(headers));
+
+ bool hasHTTPBody;
+ if (!decoder.decode(hasHTTPBody))
+ return false;
+ if (hasHTTPBody) {
+ String httpBody;
+ if (!decoder.decode(httpBody))
+ return false;
+ resourceRequest.setHTTPBody(FormData::create(httpBody.utf8()));
+ }
+
+ String firstPartyForCookies;
+ if (!decoder.decode(firstPartyForCookies))
+ return false;
+ resourceRequest.setFirstPartyForCookies(URL(URL(), firstPartyForCookies));
+
</ins><span class="cx"> uint32_t soupMessageFlags;
</span><span class="cx"> if (!decoder.decode(soupMessageFlags))
</span><span class="cx"> return false;
</span><span class="lines">@@ -60,7 +104,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void ArgumentCoder<ResourceResponse>::encodePlatformData(ArgumentEncoder& encoder, const ResourceResponse& resourceResponse)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(resourceResponse.soupMessageFlags());
</span><span class="lines">@@ -127,11 +170,59 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
</span><span class="cx"> {
</span><ins>+ bool errorIsNull = resourceError.isNull();
+ encoder << errorIsNull;
+ if (errorIsNull)
+ return;
+
+ encoder << resourceError.domain();
+ encoder << resourceError.errorCode();
+ encoder << resourceError.failingURL();
+ encoder << resourceError.localizedDescription();
+ encoder << resourceError.isCancellation();
+ encoder << resourceError.isTimeout();
+
</ins><span class="cx"> encoder << CertificateInfo(resourceError);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder& decoder, ResourceError& resourceError)
</span><span class="cx"> {
</span><ins>+ bool errorIsNull;
+ if (!decoder.decode(errorIsNull))
+ return false;
+ if (errorIsNull) {
+ resourceError = ResourceError();
+ return true;
+ }
+
+ String domain;
+ if (!decoder.decode(domain))
+ return false;
+
+ int errorCode;
+ if (!decoder.decode(errorCode))
+ return false;
+
+ String failingURL;
+ if (!decoder.decode(failingURL))
+ return false;
+
+ String localizedDescription;
+ if (!decoder.decode(localizedDescription))
+ return false;
+
+ bool isCancellation;
+ if (!decoder.decode(isCancellation))
+ return false;
+
+ bool isTimeout;
+ if (!decoder.decode(isTimeout))
+ return false;
+
+ resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
+ resourceError.setIsCancellation(isCancellation);
+ resourceError.setIsTimeout(isTimeout);
+
</ins><span class="cx"> CertificateInfo certificateInfo;
</span><span class="cx"> if (!decoder.decode(certificateInfo))
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>