<!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>[184079] releases/WebKitGTK/webkit-2.8/Source/WebCore</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/184079">184079</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 04:49:10 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181136">r181136</a> - Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
https://bugs.webkit.org/show_bug.cgi?id=142349
Patch by Joonghun Park <jh718.park@samsung.com> on 2015-03-05
Reviewed by Darin Adler.
No new tests, no behavior changes.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::removeRequestFromSessionCaches):
* platform/CrossThreadCopier.h:
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::adopt):
(WebCore::ResourceRequestBase::copyData):
* platform/network/ResourceRequestBase.h:
* platform/network/cf/ResourceRequest.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):
* platform/network/curl/ResourceRequest.h:
(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):
* platform/network/soup/ResourceRequest.h:
(WebCore::ResourceRequest::doPlatformCopyData):
(WebCore::ResourceRequest::doPlatformAdopt):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloaderWorkerThreadableLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheMemoryCachecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformCrossThreadCopierh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceRequestBasecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceRequestBaseh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceRequesth">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequest.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcurlResourceRequesth">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceRequest.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformnetworksoupResourceRequesth">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-03-05 Joonghun Park <jh718.park@samsung.com>
+
+ Use std::unique_ptr instead of PassOwnPtr|OwnPtr for ResourceRequest
+ https://bugs.webkit.org/show_bug.cgi?id=142349
+
+ Reviewed by Darin Adler.
+
+ No new tests, no behavior changes.
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::removeRequestFromSessionCaches):
+ * platform/CrossThreadCopier.h:
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::adopt):
+ (WebCore::ResourceRequestBase::copyData):
+ * platform/network/ResourceRequestBase.h:
+ * platform/network/cf/ResourceRequest.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doPlatformCopyData):
+ (WebCore::ResourceRequest::doPlatformAdopt):
+ * platform/network/curl/ResourceRequest.h:
+ (WebCore::ResourceRequest::doPlatformCopyData):
+ (WebCore::ResourceRequest::doPlatformAdopt):
+ * platform/network/soup/ResourceRequest.h:
+ (WebCore::ResourceRequest::doPlatformCopyData):
+ (WebCore::ResourceRequest::doPlatformAdopt):
+
</ins><span class="cx"> 2015-04-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Make inline continuation style change logic consistent.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -91,13 +91,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_workerClientWrapper.get());
</span><span class="cx">
</span><del>- CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
</del><ins>+ auto requestData = request.copyData().release();
</ins><span class="cx"> StringCapture capturedOutgoingReferrer(outgoingReferrer);
</span><span class="cx"> m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><del>- OwnPtr<ResourceRequest> request = ResourceRequest::adopt(adoptPtr(requestData));
</del><ins>+ auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
</ins><span class="cx"> request->setHTTPReferrer(capturedOutgoingReferrer.string());
</span><span class="cx">
</span><span class="cx"> // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -600,9 +600,9 @@
</span><span class="cx"> void MemoryCache::removeRequestFromSessionCaches(ScriptExecutionContext& context, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> if (is<WorkerGlobalScope>(context)) {
</span><del>- CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
</del><ins>+ CrossThreadResourceRequestData* requestData = request.copyData().release();
</ins><span class="cx"> downcast<WorkerGlobalScope>(context).thread().workerLoaderProxy().postTaskToLoader([requestData] (ScriptExecutionContext& context) {
</span><del>- OwnPtr<ResourceRequest> request(ResourceRequest::adopt(adoptPtr(requestData)));
</del><ins>+ auto request(ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData)));
</ins><span class="cx"> MemoryCache::removeRequestFromSessionCaches(context, *request);
</span><span class="cx"> });
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformCrossThreadCopierh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct CrossThreadCopierBase<false, false, ResourceRequest> {
</span><del>- typedef PassOwnPtr<CrossThreadResourceRequestData> Type;
</del><ins>+ typedef std::unique_ptr<CrossThreadResourceRequestData> Type;
</ins><span class="cx"> static Type copy(const ResourceRequest&);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.cpp (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.cpp 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.cpp 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -49,9 +48,9 @@
</span><span class="cx"> return *static_cast<const ResourceRequest*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ResourceRequest> ResourceRequestBase::adopt(PassOwnPtr<CrossThreadResourceRequestData> data)
</del><ins>+std::unique_ptr<ResourceRequest> ResourceRequestBase::adopt(std::unique_ptr<CrossThreadResourceRequestData> data)
</ins><span class="cx"> {
</span><del>- OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest());
</del><ins>+ auto request = std::make_unique<ResourceRequest>();
</ins><span class="cx"> request->setURL(data->m_url);
</span><span class="cx"> request->setCachePolicy(data->m_cachePolicy);
</span><span class="cx"> request->setTimeoutInterval(data->m_timeoutInterval);
</span><span class="lines">@@ -77,13 +76,13 @@
</span><span class="cx"> }
</span><span class="cx"> request->setHTTPBody(data->m_httpBody);
</span><span class="cx"> request->setAllowCookies(data->m_allowCookies);
</span><del>- request->doPlatformAdopt(data);
- return request.release();
</del><ins>+ request->doPlatformAdopt(WTF::move(data));
+ return request;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
</del><ins>+std::unique_ptr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
</ins><span class="cx"> {
</span><del>- OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());
</del><ins>+ auto data = std::make_unique<CrossThreadResourceRequestData>();
</ins><span class="cx"> data->m_url = url().copy();
</span><span class="cx"> data->m_cachePolicy = cachePolicy();
</span><span class="cx"> data->m_timeoutInterval = timeoutInterval();
</span><span class="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> if (m_httpBody)
</span><span class="cx"> data->m_httpBody = m_httpBody->deepCopy();
</span><span class="cx"> data->m_allowCookies = m_allowCookies;
</span><del>- return asResourceRequest().doPlatformCopyData(data.release());
</del><ins>+ return asResourceRequest().doPlatformCopyData(WTF::move(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ResourceRequestBase::isEmpty() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.h (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.h 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.h 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -54,10 +54,10 @@
</span><span class="cx"> class ResourceRequestBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ResourceRequest> adopt(PassOwnPtr<CrossThreadResourceRequestData>);
</del><ins>+ static std::unique_ptr<ResourceRequest> adopt(std::unique_ptr<CrossThreadResourceRequestData>);
</ins><span class="cx">
</span><span class="cx"> // Gets a copy of the data suitable for passing to another thread.
</span><del>- PassOwnPtr<CrossThreadResourceRequestData> copyData() const;
</del><ins>+ std::unique_ptr<CrossThreadResourceRequestData> copyData() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isNull() const;
</span><span class="cx"> WEBCORE_EXPORT bool isEmpty() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceRequesth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequest.h (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequest.h 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx"> NSMutableURLRequest *ensureMutableNSURLRequest();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData>) const;
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>);
</del><ins>+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData>) const;
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>);
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> RetainPtr<CFURLRequestRef> m_cfRequest;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HTTPHeaderNames.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span><span class="cx"> #include "PublicSuffix.h"
</span><span class="lines">@@ -366,7 +365,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const
</del><ins>+std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> data->m_cachePartition = m_cachePartition;
</span><span class="lines">@@ -374,7 +373,7 @@
</span><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceRequest::doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData> data)
</del><ins>+void ResourceRequest::doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData> data)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> m_cachePartition = data->m_cachePartition;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworkcurlResourceRequesth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceRequest.h (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceRequest.h 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceRequest.h 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
-
</del><span class="cx"> typedef const struct _CFURLRequest* CFURLRequestRef;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -80,8 +78,8 @@
</span><span class="cx"> void doUpdatePlatformHTTPBody() { }
</span><span class="cx"> void doUpdateResourceHTTPBody() { }
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
</del><ins>+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
+ void doPlatformAdopt(std:unique_ptr<CrossThreadResourceRequestData>) { }
</ins><span class="cx">
</span><span class="cx"> static bool s_httpPipeliningEnabled;
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformnetworksoupResourceRequesth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceRequest.h (184078 => 184079)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceRequest.h 2015-05-11 11:14:33 UTC (rev 184078)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceRequest.h 2015-05-11 11:49:10 UTC (rev 184079)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -121,8 +120,8 @@
</span><span class="cx"> void doUpdatePlatformHTTPBody() { }
</span><span class="cx"> void doUpdateResourceHTTPBody() { }
</span><span class="cx">
</span><del>- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
</del><ins>+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>) { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase {
</span></span></pre>
</div>
</div>
</body>
</html>