Index: third_party/mojo/src/mojo/edk/system/simple_dispatcher.h |
diff --git a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h |
index 1ec7ba74de462e7dabf788dde277301a623aec18..a8284358bf7c9b1eb4f7a37c93597afec530f76a 100644 |
--- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h |
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h |
@@ -25,9 +25,8 @@ class MOJO_SYSTEM_IMPL_EXPORT SimpleDispatcher : public Dispatcher { |
~SimpleDispatcher() override; |
// To be called by subclasses when the state changes (so |
- // |GetHandleSignalsStateImplNoLock()| should be checked again). Must be |
- // called under lock. |
- void HandleSignalsStateChangedNoLock(); |
+ // |GetHandleSignalsStateImplNoLock()| should be checked again). |
+ void HandleSignalsStateChangedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex()); |
// |Dispatcher| protected methods: |
void CancelAllAwakablesNoLock() override; |
@@ -39,8 +38,7 @@ class MOJO_SYSTEM_IMPL_EXPORT SimpleDispatcher : public Dispatcher { |
HandleSignalsState* signals_state) override; |
private: |
- // Protected by |lock()|: |
- AwakableList awakable_list_; |
+ AwakableList awakable_list_ MOJO_GUARDED_BY(mutex()); |
MOJO_DISALLOW_COPY_AND_ASSIGN(SimpleDispatcher); |
}; |