Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: third_party/mojo/src/mojo/edk/system/simple_dispatcher.h

Issue 1309103002: Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a8284358bf7c9b1eb4f7a37c93597afec530f76a..1ec7ba74de462e7dabf788dde277301a623aec18 100644
--- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.h
@@ -25,8 +25,9 @@
~SimpleDispatcher() override;
// To be called by subclasses when the state changes (so
- // |GetHandleSignalsStateImplNoLock()| should be checked again).
- void HandleSignalsStateChangedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex());
+ // |GetHandleSignalsStateImplNoLock()| should be checked again). Must be
+ // called under lock.
+ void HandleSignalsStateChangedNoLock();
// |Dispatcher| protected methods:
void CancelAllAwakablesNoLock() override;
@@ -38,7 +39,8 @@
HandleSignalsState* signals_state) override;
private:
- AwakableList awakable_list_ MOJO_GUARDED_BY(mutex());
+ // Protected by |lock()|:
+ AwakableList awakable_list_;
MOJO_DISALLOW_COPY_AND_ASSIGN(SimpleDispatcher);
};

Powered by Google App Engine
This is Rietveld 408576698