third_party/WebKit/Source/core/loader/ThreadableLoader.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

Patch Set: 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/TextTrackLoader.h ('k') | third_party/WebKit/Source/core/loader/ThreadableLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3d2b2d20aff83707451037ea35d51a712d6890a3..fc360b1d52b0be4befaff2e89bf5dfc62747065d 100644

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

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

@@ -36,7 +36,7 @@

#include "platform/CrossThreadCopier.h"

#include "wtf/Allocator.h"

#include "wtf/Noncopyable.h"

-#include <memory>

+#include "wtf/PassOwnPtr.h"

namespace blink {

@@ -166,8 +166,8 @@ public:

// ThreadableLoaderClient methods:

// - may call cancel()

// - can destroy the ThreadableLoader instance in them (by clearing

- // std::unique_ptr<ThreadableLoader>).

- static std::unique_ptr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);

+ // OwnPtr<ThreadableLoader>).

+ static PassOwnPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);

// The methods on the ThreadableLoaderClient passed on create() call

// may be called synchronous to start() call.