third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h - Issue 2050123002: Remove OwnPtr from Blink.

Unified Diff: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

index e0eda8ef6577bda01238416f7b50fd365c6e4727..972996099f31033f8868e9484e7961eeec568725 100644

--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

@@ -41,10 +41,9 @@

#include "platform/network/HTTPHeaderMap.h"

#include "platform/network/ResourceError.h"

#include "wtf/Forward.h"

-#include "wtf/OwnPtr.h"

-#include "wtf/PassOwnPtr.h"

#include "wtf/WeakPtr.h"

#include "wtf/text/WTFString.h"

+#include <memory>

namespace blink {

@@ -58,7 +57,7 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv

USING_FAST_MALLOC(DocumentThreadableLoader);

public:

static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);

- static PassOwnPtr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);

+ static std::unique_ptr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);

~DocumentThreadableLoader() override;

void start(const ResourceRequest&) override;

@@ -90,7 +89,7 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv

// |this| may be dead after calling these methods.

void dataSent(Resource*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;

- void responseReceived(Resource*, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;

+ void responseReceived(Resource*, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>) override;

void setSerializedCachedMetadata(Resource*, const char*, size_t) override;

void dataReceived(Resource*, const char* data, size_t dataLength) override;

void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) override;

@@ -109,7 +108,7 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv

// common to both sync and async mode.

// |this| may be dead after calling these method in async mode.

- void handleResponse(unsigned long identifier, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>);

+ void handleResponse(unsigned long identifier, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>);

void handleReceivedData(const char* data, size_t dataLength);

void handleSuccessfulFinish(unsigned long identifier, double finishTime);