third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h - Issue 2050123002: 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/platform/scheduler/CancellableTaskFactory.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/platform/network/ResourceTimingInfo.cpp ('k') | third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h

diff --git a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h

index 18741b1f1b36e5e24fd5fee3328a93fefb205072..c6684da5ea27af4da590e0143ccf118530b9b2d8 100644

--- a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h

+++ b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h

@@ -11,9 +11,9 @@

#include "wtf/Allocator.h"

#include "wtf/Functional.h"

#include "wtf/Noncopyable.h"

-#include "wtf/OwnPtr.h"

-#include "wtf/PassOwnPtr.h"

+#include "wtf/PtrUtil.h"

#include "wtf/WeakPtr.h"

+#include <memory>

#include <type_traits>

namespace blink {

@@ -37,15 +37,15 @@ public:

// variety, which will refer back to the owner heap object safely (but weakly.)

template<typename T>

- static PassOwnPtr<CancellableTaskFactory> create(T* thisObject, void (T::*method)(), typename std::enable_if<IsGarbageCollectedType<T>::value>::type* = nullptr)

+ static std::unique_ptr<CancellableTaskFactory> create(T* thisObject, void (T::*method)(), typename std::enable_if<IsGarbageCollectedType<T>::value>::type* = nullptr)

{

- return adoptPtr(new CancellableTaskFactory(WTF::bind(method, CrossThreadWeakPersistentThisPointer<T>(thisObject))));

+ return wrapUnique(new CancellableTaskFactory(WTF::bind(method, CrossThreadWeakPersistentThisPointer<T>(thisObject))));

}

template<typename T>

- static PassOwnPtr<CancellableTaskFactory> create(T* thisObject, void (T::*method)(), typename std::enable_if<!IsGarbageCollectedType<T>::value>::type* = nullptr)

+ static std::unique_ptr<CancellableTaskFactory> create(T* thisObject, void (T::*method)(), typename std::enable_if<!IsGarbageCollectedType<T>::value>::type* = nullptr)

{

- return adoptPtr(new CancellableTaskFactory(WTF::bind(method, thisObject)));

+ return wrapUnique(new CancellableTaskFactory(WTF::bind(method, thisObject)));

}

bool isPending() const