| Index: mojo/edk/system/platform_handle_dispatcher.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h b/mojo/edk/system/platform_handle_dispatcher.h
|
| similarity index 73%
|
| copy from third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
|
| copy to mojo/edk/system/platform_handle_dispatcher.h
|
| index 8e8cf6904d96450fb8f6223cabcc78996155d9fe..99ffcac7b06acb61faf3d75a39e9f8cfb128ad36 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
|
| +++ b/mojo/edk/system/platform_handle_dispatcher.h
|
| @@ -11,7 +11,7 @@
|
| #include "mojo/public/cpp/system/macros.h"
|
|
|
| namespace mojo {
|
| -namespace system {
|
| +namespace edk {
|
|
|
| // A dispatcher that simply wraps/transports a |PlatformHandle| (only for use by
|
| // the embedder).
|
| @@ -19,12 +19,12 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformHandleDispatcher final
|
| : public SimpleDispatcher {
|
| public:
|
| static scoped_refptr<PlatformHandleDispatcher> Create(
|
| - embedder::ScopedPlatformHandle platform_handle) {
|
| + ScopedPlatformHandle platform_handle) {
|
| return make_scoped_refptr(
|
| new PlatformHandleDispatcher(platform_handle.Pass()));
|
| }
|
|
|
| - embedder::ScopedPlatformHandle PassPlatformHandle();
|
| + ScopedPlatformHandle PassPlatformHandle();
|
|
|
| // |Dispatcher| public methods:
|
| Type GetType() const override;
|
| @@ -32,37 +32,32 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformHandleDispatcher final
|
| // The "opposite" of |SerializeAndClose()|. (Typically this is called by
|
| // |Dispatcher::Deserialize()|.)
|
| static scoped_refptr<PlatformHandleDispatcher> Deserialize(
|
| - Channel* channel,
|
| const void* source,
|
| size_t size,
|
| - embedder::PlatformHandleVector* platform_handles);
|
| + PlatformHandleVector* platform_handles);
|
|
|
| private:
|
| explicit PlatformHandleDispatcher(
|
| - embedder::ScopedPlatformHandle platform_handle);
|
| + ScopedPlatformHandle platform_handle);
|
| ~PlatformHandleDispatcher() override;
|
|
|
| // |Dispatcher| protected methods:
|
| void CloseImplNoLock() override;
|
| scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
|
| override;
|
| - void StartSerializeImplNoLock(Channel* channel,
|
| - size_t* max_size,
|
| - size_t* max_platform_handles) override
|
| - MOJO_NOT_THREAD_SAFE;
|
| + void StartSerializeImplNoLock(size_t* max_size,
|
| + size_t* max_platform_handles) override;
|
| bool EndSerializeAndCloseImplNoLock(
|
| - Channel* channel,
|
| void* destination,
|
| size_t* actual_size,
|
| - embedder::PlatformHandleVector* platform_handles) override
|
| - MOJO_NOT_THREAD_SAFE;
|
| + PlatformHandleVector* platform_handles) override;
|
|
|
| - embedder::ScopedPlatformHandle platform_handle_ MOJO_GUARDED_BY(mutex());
|
| + ScopedPlatformHandle platform_handle_;
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformHandleDispatcher);
|
| };
|
|
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| #endif // MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_
|
|
|