OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "platform/scheduler/CancellableTaskFactory.h" | 6 #include "platform/scheduler/CancellableTaskFactory.h" |
7 | 7 |
8 #include "public/platform/Platform.h" | 8 #include "public/platform/Platform.h" |
9 #include "wtf/InstanceCounter.h" | 9 #include "wtf/InstanceCounter.h" |
10 | 10 |
11 namespace blink { | 11 namespace blink { |
12 | 12 |
13 void CancellableTaskFactory::cancel() | 13 void CancellableTaskFactory::cancel() |
14 { | 14 { |
15 m_weakPtrFactory.revokeAll(); | 15 m_weakPtrFactory.revokeAll(); |
16 } | 16 } |
17 | 17 |
18 WebThread::Task* CancellableTaskFactory::cancelAndCreate() | 18 WebThread::Task* CancellableTaskFactory::cancelAndCreate() |
19 { | 19 { |
20 cancel(); | 20 cancel(); |
21 return new CancellableTask(m_weakPtrFactory.createWeakPtr()); | 21 return new CancellableTask(m_weakPtrFactory.createWeakPtr()); |
22 } | 22 } |
23 | 23 |
| 24 NO_LAZY_SWEEP_SANITIZE_ADDRESS |
24 void CancellableTaskFactory::CancellableTask::run() | 25 void CancellableTaskFactory::CancellableTask::run() |
25 { | 26 { |
26 if (m_weakPtr.get()) { | 27 if (CancellableTaskFactory* taskFactory = m_weakPtr.get()) { |
27 Closure* closure = m_weakPtr->m_closure.get(); | 28 #if defined(ADDRESS_SANITIZER) |
28 m_weakPtr->m_weakPtrFactory.revokeAll(); | 29 if (taskFactory->m_unpoisonBeforeUpdate) |
| 30 ASAN_UNPOISON_MEMORY_REGION(reinterpret_cast<unsigned char*>(taskFac
tory), sizeof(CancellableTaskFactory)); |
| 31 #endif |
| 32 Closure* closure = taskFactory->m_closure.get(); |
| 33 taskFactory->m_weakPtrFactory.revokeAll(); |
29 (*closure)(); | 34 (*closure)(); |
30 } | 35 } |
31 } | 36 } |
32 | 37 |
33 } // namespace blink | 38 } // namespace blink |
OLD | NEW |