Index: third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp |
index 796d3fe76f4fbe0a8062a5c5c2ee44aa59b00cec..e90b4c5c0e4c041130e8d412da23dbca06310116 100644 |
--- a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp |
@@ -46,14 +46,15 @@ |
#include "platform/network/ResourceTimingInfo.h" |
#include "platform/weborigin/SecurityPolicy.h" |
#include "public/platform/Platform.h" |
-#include "wtf/OwnPtr.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/Vector.h" |
+#include <memory> |
namespace blink { |
-static PassOwnPtr<Vector<char>> createVectorFromMemoryRegion(const char* data, unsigned dataLength) |
+static std::unique_ptr<Vector<char>> createVectorFromMemoryRegion(const char* data, unsigned dataLength) |
{ |
- OwnPtr<Vector<char>> buffer = adoptPtr(new Vector<char>(dataLength)); |
+ std::unique_ptr<Vector<char>> buffer = wrapUnique(new Vector<char>(dataLength)); |
memcpy(buffer->data(), data, dataLength); |
return buffer; |
} |
@@ -72,7 +73,7 @@ WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope& workerGlobalSc |
void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions) |
{ |
- OwnPtr<WorkerThreadableLoader> loader = adoptPtr(new WorkerThreadableLoader(workerGlobalScope, &client, options, resourceLoaderOptions, LoadSynchronously)); |
+ std::unique_ptr<WorkerThreadableLoader> loader = wrapUnique(new WorkerThreadableLoader(workerGlobalScope, &client, options, resourceLoaderOptions, LoadSynchronously)); |
loader->start(request); |
} |
@@ -133,7 +134,7 @@ void WorkerThreadableLoader::MainThreadBridgeBase::mainThreadCreateLoader(Thread |
ASSERT(m_mainThreadLoader); |
} |
-void WorkerThreadableLoader::MainThreadBridgeBase::mainThreadStart(PassOwnPtr<CrossThreadResourceRequestData> requestData) |
+void WorkerThreadableLoader::MainThreadBridgeBase::mainThreadStart(std::unique_ptr<CrossThreadResourceRequestData> requestData) |
{ |
ASSERT(isMainThread()); |
ASSERT(m_mainThreadLoader); |
@@ -216,7 +217,7 @@ void WorkerThreadableLoader::MainThreadBridgeBase::didSendData(unsigned long lon |
forwardTaskToWorker(createCrossThreadTask(&ThreadableLoaderClientWrapper::didSendData, m_workerClientWrapper, bytesSent, totalBytesToBeSent)); |
} |
-void WorkerThreadableLoader::MainThreadBridgeBase::didReceiveResponse(unsigned long identifier, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle) |
+void WorkerThreadableLoader::MainThreadBridgeBase::didReceiveResponse(unsigned long identifier, const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle) |
{ |
forwardTaskToWorker(createCrossThreadTask(&ThreadableLoaderClientWrapper::didReceiveResponse, m_workerClientWrapper, identifier, response, passed(std::move(handle)))); |
} |
@@ -304,7 +305,7 @@ WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge( |
void WorkerThreadableLoader::MainThreadSyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope) |
{ |
WaitableEvent* terminationEvent = workerGlobalScope.thread()->terminationEvent(); |
- m_loaderDoneEvent = adoptPtr(new WaitableEvent()); |
+ m_loaderDoneEvent = wrapUnique(new WaitableEvent()); |
startInMainThread(request, workerGlobalScope); |