| Index: third_party/mojo/src/mojo/edk/system/dispatcher.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/dispatcher.h b/third_party/mojo/src/mojo/edk/system/dispatcher.h
|
| index c069269b1a2bee1aae2eb5c94e2a20ce2857a2a6..4bbc5ed1296e7b74b861625164e3db71057dac93 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/dispatcher.h
|
| +++ b/third_party/mojo/src/mojo/edk/system/dispatcher.h
|
| @@ -297,6 +297,11 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher
|
| size_t* actual_size,
|
| embedder::PlatformHandleVector* platform_handles);
|
|
|
| + // This should be overridden to return true if/when there's an ongoing
|
| + // operation (e.g., two-phase read/writes on data pipes) that should prevent a
|
| + // handle from being sent over a message pipe (with status "busy").
|
| + virtual bool IsBusyNoLock() const;
|
| +
|
| // Available to subclasses. (Note: Returns a non-const reference, just like
|
| // |base::AutoLock|'s constructor takes a non-const reference.)
|
| base::Lock& lock() const { return lock_; }
|
| @@ -304,11 +309,6 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher
|
| private:
|
| friend class DispatcherTransport;
|
|
|
| - // This should be overridden to return true if/when there's an ongoing
|
| - // operation (e.g., two-phase read/writes on data pipes) that should prevent a
|
| - // handle from being sent over a message pipe (with status "busy").
|
| - virtual bool IsBusyNoLock() const;
|
| -
|
| // Closes the dispatcher. This must be done under lock, and unlike |Close()|,
|
| // the dispatcher must not be closed already. (This is the "equivalent" of
|
| // |CreateEquivalentDispatcherAndCloseNoLock()|, for situations where the
|
|
|