Index: third_party/WebKit/Source/platform/WebTaskRunner.cpp |
diff --git a/third_party/WebKit/Source/platform/WebTaskRunner.cpp b/third_party/WebKit/Source/platform/WebTaskRunner.cpp |
index 40c83ae2580fb76b841d3234d864c9dd932a2bb1..97a082a01fb7605c0d2c35f979a8608786b6dfbb 100644 |
--- a/third_party/WebKit/Source/platform/WebTaskRunner.cpp |
+++ b/third_party/WebKit/Source/platform/WebTaskRunner.cpp |
@@ -6,60 +6,24 @@ |
namespace blink { |
-class SameThreadTask : public WebTaskRunner::Task { |
- USING_FAST_MALLOC(SameThreadTask); |
- WTF_MAKE_NONCOPYABLE(SameThreadTask); |
-public: |
- explicit SameThreadTask(std::unique_ptr<WTF::Closure> closure) |
- : m_closure(std::move(closure)) |
- { |
- } |
- |
- void run() override |
- { |
- (*m_closure)(); |
- } |
- |
-private: |
- std::unique_ptr<WTF::Closure> m_closure; |
-}; |
- |
-class CrossThreadTask : public WebTaskRunner::Task { |
- USING_FAST_MALLOC(CrossThreadTask); |
- WTF_MAKE_NONCOPYABLE(CrossThreadTask); |
-public: |
- explicit CrossThreadTask(std::unique_ptr<CrossThreadClosure> closure) |
- : m_closure(std::move(closure)) |
- { |
- } |
- |
- void run() override |
- { |
- (*m_closure)(); |
- } |
- |
-private: |
- std::unique_ptr<CrossThreadClosure> m_closure; |
-}; |
- |
void WebTaskRunner::postTask(const WebTraceLocation& location, std::unique_ptr<CrossThreadClosure> task) |
{ |
- postTask(location, new CrossThreadTask(std::move(task))); |
+ toSingleThreadTaskRunner()->PostTask(location, convertToBaseCallback(std::move(task))); |
} |
void WebTaskRunner::postDelayedTask(const WebTraceLocation& location, std::unique_ptr<CrossThreadClosure> task, long long delayMs) |
{ |
- postDelayedTask(location, new CrossThreadTask(std::move(task)), delayMs); |
+ toSingleThreadTaskRunner()->PostDelayedTask(location, convertToBaseCallback(std::move(task)), base::TimeDelta::FromMilliseconds(delayMs)); |
} |
void WebTaskRunner::postTask(const WebTraceLocation& location, std::unique_ptr<WTF::Closure> task) |
{ |
- postTask(location, new SameThreadTask(std::move(task))); |
+ toSingleThreadTaskRunner()->PostTask(location, convertToBaseCallback(std::move(task))); |
} |
void WebTaskRunner::postDelayedTask(const WebTraceLocation& location, std::unique_ptr<WTF::Closure> task, long long delayMs) |
{ |
- postDelayedTask(location, new SameThreadTask(std::move(task)), delayMs); |
+ toSingleThreadTaskRunner()->PostDelayedTask(location, convertToBaseCallback(std::move(task)), base::TimeDelta::FromMilliseconds(delayMs)); |
} |
} // namespace blink |