Index: third_party/WebKit/Source/platform/Timer.h |
diff --git a/third_party/WebKit/Source/platform/Timer.h b/third_party/WebKit/Source/platform/Timer.h |
index 243b9ba3533cd481a8e1470d3c15187d6da9ff7c..c1d0a53dfece8fcea6dac0e472560f30f2d8d0d5 100644 |
--- a/third_party/WebKit/Source/platform/Timer.h |
+++ b/third_party/WebKit/Source/platform/Timer.h |
@@ -88,7 +88,6 @@ class PLATFORM_EXPORT TimerBase { |
virtual WebTaskRunner* timerTaskRunner() const; |
- NO_LAZY_SWEEP_SANITIZE_ADDRESS |
Nico
2016/10/03 02:49:35
Can this be deleted completely or should this be N
|
virtual bool canFire() const { return true; } |
double timerMonotonicallyIncreasingTime() const; |
@@ -141,7 +140,6 @@ class TaskRunnerTimer : public TimerBase { |
protected: |
void fired() override { (m_object->*m_function)(this); } |
- NO_LAZY_SWEEP_SANITIZE_ADDRESS |
bool canFire() const override { |
// Oilpan: if a timer fires while Oilpan heaps are being lazily |
// swept, it is not safe to proceed if the object is about to |
@@ -192,7 +190,6 @@ class UnthrottledThreadTimer : public TaskRunnerTimer<TimerFiredClass> { |
timerFiredFunction) {} |
}; |
-NO_LAZY_SWEEP_SANITIZE_ADDRESS |
inline bool TimerBase::isActive() const { |
ASSERT(m_thread == currentThread()); |
return m_weakPtrFactory.hasWeakPtrs(); |