| 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 f3368332e89ecd2a37661612ab7c92866a388e31..12a1f2ae6daa7ed9fae3a8c68660f9ad040bea40 100644
|
| --- a/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h
|
| +++ b/third_party/WebKit/Source/platform/scheduler/CancellableTaskFactory.h
|
| @@ -29,7 +29,7 @@ public:
|
| // CancellableTaskFactory, and one when that owning object isn't controlled
|
| // by Oilpan.
|
| //
|
| - // In the Oilpan case, as WTF::SameThreadClosure objects are off-heap, we have to construct the
|
| + // In the Oilpan case, as WTF::Closure objects are off-heap, we have to construct the
|
| // closure in such a manner that it doesn't end up referring back to the owning heap
|
| // object with a strong Persistent<> GC root reference. If we do, this will create
|
| // a heap <-> off-heap cycle and leak, the owning object can never be GCed.
|
| @@ -62,7 +62,7 @@ public:
|
| protected:
|
| // Only intended used by unit tests wanting to stack allocate and/or pass in a closure value.
|
| // Please use the create() factory method elsewhere.
|
| - explicit CancellableTaskFactory(std::unique_ptr<SameThreadClosure> closure)
|
| + explicit CancellableTaskFactory(std::unique_ptr<WTF::Closure> closure)
|
| : m_closure(std::move(closure))
|
| , m_weakPtrFactory(this)
|
| {
|
| @@ -85,7 +85,7 @@ private:
|
| WeakPtr<CancellableTaskFactory> m_weakPtr;
|
| };
|
|
|
| - std::unique_ptr<SameThreadClosure> m_closure;
|
| + std::unique_ptr<WTF::Closure> m_closure;
|
| WeakPtrFactory<CancellableTaskFactory> m_weakPtrFactory;
|
| };
|
|
|
|
|