Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184078 => 184079)
--- 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)
@@ -1,3 +1,32 @@
+2015-03-05 Joonghun Park <[email protected]>
+
+ 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):
+
2015-04-14 Zalan Bujtas <[email protected]>
Make inline continuation style change logic consistent.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/WorkerThreadableLoader.cpp (184078 => 184079)
--- 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)
@@ -91,13 +91,13 @@
{
ASSERT(m_workerClientWrapper.get());
- CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
+ auto requestData = request.copyData().release();
StringCapture capturedOutgoingReferrer(outgoingReferrer);
m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
ASSERT(isMainThread());
Document& document = downcast<Document>(context);
- OwnPtr<ResourceRequest> request = ResourceRequest::adopt(adoptPtr(requestData));
+ auto request = ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData));
request->setHTTPReferrer(capturedOutgoingReferrer.string());
// FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/MemoryCache.cpp (184078 => 184079)
--- 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)
@@ -600,9 +600,9 @@
void MemoryCache::removeRequestFromSessionCaches(ScriptExecutionContext& context, const ResourceRequest& request)
{
if (is<WorkerGlobalScope>(context)) {
- CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
+ CrossThreadResourceRequestData* requestData = request.copyData().release();
downcast<WorkerGlobalScope>(context).thread().workerLoaderProxy().postTaskToLoader([requestData] (ScriptExecutionContext& context) {
- OwnPtr<ResourceRequest> request(ResourceRequest::adopt(adoptPtr(requestData)));
+ auto request(ResourceRequest::adopt(std::unique_ptr<CrossThreadResourceRequestData>(requestData)));
MemoryCache::removeRequestFromSessionCaches(context, *request);
});
return;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/CrossThreadCopier.h (184078 => 184079)
--- 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)
@@ -137,7 +137,7 @@
};
template<> struct CrossThreadCopierBase<false, false, ResourceRequest> {
- typedef PassOwnPtr<CrossThreadResourceRequestData> Type;
+ typedef std::unique_ptr<CrossThreadResourceRequestData> Type;
static Type copy(const ResourceRequest&);
};
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.cpp (184078 => 184079)
--- 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)
@@ -28,7 +28,6 @@
#include "HTTPHeaderNames.h"
#include "ResourceRequest.h"
-#include <wtf/PassOwnPtr.h>
namespace WebCore {
@@ -49,9 +48,9 @@
return *static_cast<const ResourceRequest*>(this);
}
-PassOwnPtr<ResourceRequest> ResourceRequestBase::adopt(PassOwnPtr<CrossThreadResourceRequestData> data)
+std::unique_ptr<ResourceRequest> ResourceRequestBase::adopt(std::unique_ptr<CrossThreadResourceRequestData> data)
{
- OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest());
+ auto request = std::make_unique<ResourceRequest>();
request->setURL(data->m_url);
request->setCachePolicy(data->m_cachePolicy);
request->setTimeoutInterval(data->m_timeoutInterval);
@@ -77,13 +76,13 @@
}
request->setHTTPBody(data->m_httpBody);
request->setAllowCookies(data->m_allowCookies);
- request->doPlatformAdopt(data);
- return request.release();
+ request->doPlatformAdopt(WTF::move(data));
+ return request;
}
-PassOwnPtr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
+std::unique_ptr<CrossThreadResourceRequestData> ResourceRequestBase::copyData() const
{
- OwnPtr<CrossThreadResourceRequestData> data = "" CrossThreadResourceRequestData());
+ auto data = ""
data->m_url = url().copy();
data->m_cachePolicy = cachePolicy();
data->m_timeoutInterval = timeoutInterval();
@@ -100,7 +99,7 @@
if (m_httpBody)
data->m_httpBody = m_httpBody->deepCopy();
data->m_allowCookies = m_allowCookies;
- return asResourceRequest().doPlatformCopyData(data.release());
+ return asResourceRequest().doPlatformCopyData(WTF::move(data));
}
bool ResourceRequestBase::isEmpty() const
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/ResourceRequestBase.h (184078 => 184079)
--- 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)
@@ -54,10 +54,10 @@
class ResourceRequestBase {
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassOwnPtr<ResourceRequest> adopt(PassOwnPtr<CrossThreadResourceRequestData>);
+ static std::unique_ptr<ResourceRequest> adopt(std::unique_ptr<CrossThreadResourceRequestData>);
// Gets a copy of the data suitable for passing to another thread.
- PassOwnPtr<CrossThreadResourceRequestData> copyData() const;
+ std::unique_ptr<CrossThreadResourceRequestData> copyData() const;
WEBCORE_EXPORT bool isNull() const;
WEBCORE_EXPORT bool isEmpty() const;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequest.h (184078 => 184079)
--- 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)
@@ -141,8 +141,8 @@
NSMutableURLRequest *ensureMutableNSURLRequest();
#endif
- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData>) const;
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>);
+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData>) const;
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>);
#if USE(CFNETWORK)
RetainPtr<CFURLRequestRef> m_cfRequest;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (184078 => 184079)
--- 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)
@@ -28,7 +28,6 @@
#include "HTTPHeaderNames.h"
#include "ResourceRequest.h"
-#include <wtf/PassOwnPtr.h>
#if ENABLE(PUBLIC_SUFFIX_LIST)
#include "PublicSuffix.h"
@@ -366,7 +365,7 @@
}
#endif
-PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const
+std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const
{
#if ENABLE(CACHE_PARTITIONING)
data->m_cachePartition = m_cachePartition;
@@ -374,7 +373,7 @@
return data;
}
-void ResourceRequest::doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData> data)
+void ResourceRequest::doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData> data)
{
#if ENABLE(CACHE_PARTITIONING)
m_cachePartition = data->m_cachePartition;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/curl/ResourceRequest.h (184078 => 184079)
--- 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)
@@ -29,8 +29,6 @@
#include "ResourceRequestBase.h"
-#include <wtf/PassOwnPtr.h>
-
typedef const struct _CFURLRequest* CFURLRequestRef;
namespace WebCore {
@@ -80,8 +78,8 @@
void doUpdatePlatformHTTPBody() { }
void doUpdateResourceHTTPBody() { }
- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
+ void doPlatformAdopt(std:unique_ptr<CrossThreadResourceRequestData>) { }
static bool s_httpPipeliningEnabled;
};
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/network/soup/ResourceRequest.h (184078 => 184079)
--- 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)
@@ -30,7 +30,6 @@
#include "GUniquePtrSoup.h"
#include "ResourceRequestBase.h"
#include <libsoup/soup.h>
-#include <wtf/PassOwnPtr.h>
namespace WebCore {
@@ -121,8 +120,8 @@
void doUpdatePlatformHTTPBody() { }
void doUpdateResourceHTTPBody() { }
- PassOwnPtr<CrossThreadResourceRequestData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceRequestData> data) const { return data; }
- void doPlatformAdopt(PassOwnPtr<CrossThreadResourceRequestData>) { }
+ std::unique_ptr<CrossThreadResourceRequestData> doPlatformCopyData(std::unique_ptr<CrossThreadResourceRequestData> data) const { return data; }
+ void doPlatformAdopt(std::unique_ptr<CrossThreadResourceRequestData>) { }
};
struct CrossThreadResourceRequestData : public CrossThreadResourceRequestDataBase {
