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

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

Issue 1311043003: 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.cc
diff --git a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
index f7db8759aaf3f67b03becb9f4ddb0b38597f5b97..7264a1219d596dcfbaccc861eed3c261f7dbcf6f 100644
--- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
+++ b/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
@@ -16,12 +16,12 @@ SimpleDispatcher::~SimpleDispatcher() {
}
void SimpleDispatcher::HandleSignalsStateChangedNoLock() {
- lock().AssertAcquired();
+ mutex().AssertHeld();
awakable_list_.AwakeForStateChange(GetHandleSignalsStateImplNoLock());
}
void SimpleDispatcher::CancelAllAwakablesNoLock() {
- lock().AssertAcquired();
+ mutex().AssertHeld();
awakable_list_.CancelAll();
}
@@ -30,7 +30,7 @@ MojoResult SimpleDispatcher::AddAwakableImplNoLock(
MojoHandleSignals signals,
uint32_t context,
HandleSignalsState* signals_state) {
- lock().AssertAcquired();
+ mutex().AssertHeld();
HandleSignalsState state(GetHandleSignalsStateImplNoLock());
if (state.satisfies(signals)) {
@@ -51,7 +51,7 @@ MojoResult SimpleDispatcher::AddAwakableImplNoLock(
void SimpleDispatcher::RemoveAwakableImplNoLock(
Awakable* awakable,
HandleSignalsState* signals_state) {
- lock().AssertAcquired();
+ mutex().AssertHeld();
awakable_list_.Remove(awakable);
if (signals_state)
*signals_state = GetHandleSignalsStateImplNoLock();

Powered by Google App Engine
This is Rietveld 408576698