<!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>[169755] trunk/Source</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/169755">169755</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 12:07:47 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Serialize ResourceRequests without platform request
https://bugs.webkit.org/show_bug.cgi?id=133679
Reviewed by Alexey Proskuryakov.
Source/WebCore:
We create platform requests in the web process just so we can serialize them. This is unnecessary work.
* platform/network/ResourceRequestBase.h:
(WebCore::ResourceRequestBase::encodingRequiresPlatformData):
(WebCore::ResourceRequestBase::encodeWithoutPlatformData):
(WebCore::ResourceRequestBase::decodeWithoutPlatformData):
Add encoding and decoding functions here to avoid exposing internals.
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::encodingRequiresPlatformData):
Allow encoding without platform data if it hasn't been created yet and there is no request body.
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<ResourceRequest>::encode):
(IPC::ArgumentCoder<ResourceRequest>::decode):
Encode ResourceRequest directly if possible.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequesth">trunk/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169754 => 169755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 18:47:01 UTC (rev 169754)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 19:07:47 UTC (rev 169755)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-06-10 Antti Koivisto <antti@apple.com>
+
+ Serialize ResourceRequests without platform request
+ https://bugs.webkit.org/show_bug.cgi?id=133679
+
+ Reviewed by Alexey Proskuryakov.
+
+ We create platform requests in the web process just so we can serialize them. This is unnecessary work.
+
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::encodingRequiresPlatformData):
+ (WebCore::ResourceRequestBase::encodeWithoutPlatformData):
+ (WebCore::ResourceRequestBase::decodeWithoutPlatformData):
+
+ Add encoding and decoding functions here to avoid exposing internals.
+
+ * platform/network/cf/ResourceRequest.h:
+ (WebCore::ResourceRequest::encodingRequiresPlatformData):
+
+ Allow encoding without platform data if it hasn't been created yet and there is no request body.
+
</ins><span class="cx"> 2014-06-10 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Send more context about text selection to telephone number scanner
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169754 => 169755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-10 18:47:01 UTC (rev 169754)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-10 19:07:47 UTC (rev 169755)
</span><span class="lines">@@ -143,6 +143,12 @@
</span><span class="cx"> void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+ bool encodingRequiresPlatformData() const { return true; }
+#endif
+ template<class Encoder> void encodeWithoutPlatformData(Encoder&) const;
+ template<class Decoder> bool decodeWithoutPlatformData(Decoder&);
+
</ins><span class="cx"> static double defaultTimeoutInterval(); // May return 0 when using platform default.
</span><span class="cx"> static void setDefaultTimeoutInterval(double);
</span><span class="cx">
</span><span class="lines">@@ -257,6 +263,66 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void initializeHTTPConnectionSettingsOnStartup();
</span><span class="cx"> #endif
</span><ins>+
+template<class Encoder>
+void ResourceRequestBase::encodeWithoutPlatformData(Encoder& encoder) const
+{
+ ASSERT(!m_httpBody);
+ ASSERT(!m_platformRequestUpdated);
+ encoder << m_url.string();
+ encoder << m_timeoutInterval;
+ encoder << m_firstPartyForCookies.string();
+ encoder << m_httpMethod;
+ encoder << m_httpHeaderFields;
+ encoder << m_responseContentDispositionEncodingFallbackArray;
+ encoder.encodeEnum(m_cachePolicy);
+ encoder << m_allowCookies;
+ encoder.encodeEnum(m_priority);
+}
+
+template<class Decoder>
+bool ResourceRequestBase::decodeWithoutPlatformData(Decoder& decoder)
+{
+ String url;
+ if (!decoder.decode(url))
+ return false;
+ m_url = URL(ParsedURLString, url);
+
+ if (!decoder.decode(m_timeoutInterval))
+ return false;
+
+ String firstPartyForCookies;
+ if (!decoder.decode(firstPartyForCookies))
+ return false;
+ m_firstPartyForCookies = URL(ParsedURLString, firstPartyForCookies);
+
+ if (!decoder.decode(m_httpMethod))
+ return false;
+
+ if (!decoder.decode(m_httpHeaderFields))
+ return false;
+
+ if (!decoder.decode(m_responseContentDispositionEncodingFallbackArray))
+ return false;
+
+ ResourceRequestCachePolicy cachePolicy;
+ if (!decoder.decodeEnum(cachePolicy))
+ return false;
+ m_cachePolicy = cachePolicy;
+
+ bool allowCookies;
+ if (!decoder.decode(allowCookies))
+ return false;
+ m_allowCookies = allowCookies;
+
+ ResourceLoadPriority priority;
+ if (!decoder.decodeEnum(priority))
+ return false;
+ m_priority = priority;
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ResourceRequestBase_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (169754 => 169755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-10 18:47:01 UTC (rev 169754)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-06-10 19:07:47 UTC (rev 169755)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> void applyWebArchiveHackForMail();
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+ bool encodingRequiresPlatformData() const { return m_httpBody || m_nsRequest; }
</ins><span class="cx"> NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169754 => 169755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-10 18:47:01 UTC (rev 169754)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-10 19:07:47 UTC (rev 169755)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-10 Antti Koivisto <antti@apple.com>
+
+ Serialize ResourceRequests without platform request
+ https://bugs.webkit.org/show_bug.cgi?id=133679
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<ResourceRequest>::encode):
+ (IPC::ArgumentCoder<ResourceRequest>::decode):
+
+ Encode ResourceRequest directly if possible.
+
</ins><span class="cx"> 2014-06-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (169754 => 169755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-10 18:47:01 UTC (rev 169754)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-10 19:07:47 UTC (rev 169755)
</span><span class="lines">@@ -675,7 +675,13 @@
</span><span class="cx"> encoder << resourceRequest.hiddenFromInspector();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- encodePlatformData(encoder, resourceRequest);
</del><ins>+ if (resourceRequest.encodingRequiresPlatformData()) {
+ encoder << true;
+ encodePlatformData(encoder, resourceRequest);
+ return;
+ }
+ encoder << false;
+ resourceRequest.encodeWithoutPlatformData(encoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
</span><span class="lines">@@ -730,7 +736,13 @@
</span><span class="cx"> resourceRequest.setHiddenFromInspector(isHiddenFromInspector);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return decodePlatformData(decoder, resourceRequest);
</del><ins>+ bool hasPlatformData;
+ if (!decoder.decode(hasPlatformData))
+ return false;
+ if (hasPlatformData)
+ return decodePlatformData(decoder, resourceRequest);
+
+ return resourceRequest.decodeWithoutPlatformData(decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder& encoder, const ResourceResponse& resourceResponse)
</span></span></pre>
</div>
</div>
</body>
</html>