third_party/mojo/src/mojo/edk/system/simple_dispatcher.h - Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cherry-pick GL_APIENTRY addition back in 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

« no previous file with comments | « third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc ('k') | third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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);

};