| Index: mojo/edk/system/shared_buffer_dispatcher.h
|
| diff --git a/mojo/edk/system/shared_buffer_dispatcher.h b/mojo/edk/system/shared_buffer_dispatcher.h
|
| index c61bd5cff545ffec68386eb048d7779fc180152c..853c91b38b8fa6cfbc4c2556af42af8178c50df0 100644
|
| --- a/mojo/edk/system/shared_buffer_dispatcher.h
|
| +++ b/mojo/edk/system/shared_buffer_dispatcher.h
|
| @@ -7,8 +7,8 @@
|
|
|
| #include "mojo/edk/embedder/platform_shared_buffer.h"
|
| #include "mojo/edk/system/memory.h"
|
| -#include "mojo/edk/system/ref_ptr.h"
|
| #include "mojo/edk/system/simple_dispatcher.h"
|
| +#include "mojo/edk/util/ref_ptr.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
|
|
| namespace mojo {
|
| @@ -41,7 +41,7 @@ class SharedBufferDispatcher final : public SimpleDispatcher {
|
| // Static factory method: |validated_options| must be validated (obviously).
|
| // Returns null on error; |*result| will be set to an appropriate result
|
| // code).
|
| - static RefPtr<SharedBufferDispatcher> Create(
|
| + static util::RefPtr<SharedBufferDispatcher> Create(
|
| embedder::PlatformSupport* platform_support,
|
| const MojoCreateSharedBufferOptions& validated_options,
|
| uint64_t num_bytes,
|
| @@ -52,14 +52,14 @@ class SharedBufferDispatcher final : public SimpleDispatcher {
|
|
|
| // The "opposite" of |SerializeAndClose()|. (Typically this is called by
|
| // |Dispatcher::Deserialize()|.)
|
| - static RefPtr<SharedBufferDispatcher> Deserialize(
|
| + static util::RefPtr<SharedBufferDispatcher> Deserialize(
|
| Channel* channel,
|
| const void* source,
|
| size_t size,
|
| embedder::PlatformHandleVector* platform_handles);
|
|
|
| private:
|
| - static RefPtr<SharedBufferDispatcher> CreateInternal(
|
| + static util::RefPtr<SharedBufferDispatcher> CreateInternal(
|
| scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer) {
|
| return AdoptRef(new SharedBufferDispatcher(shared_buffer.Pass()));
|
| }
|
| @@ -79,10 +79,11 @@ class SharedBufferDispatcher final : public SimpleDispatcher {
|
|
|
| // |Dispatcher| protected methods:
|
| void CloseImplNoLock() override;
|
| - RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock() override;
|
| + util::RefPtr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
|
| + override;
|
| MojoResult DuplicateBufferHandleImplNoLock(
|
| UserPointer<const MojoDuplicateBufferHandleOptions> options,
|
| - RefPtr<Dispatcher>* new_dispatcher) override;
|
| + util::RefPtr<Dispatcher>* new_dispatcher) override;
|
| MojoResult MapBufferImplNoLock(
|
| uint64_t offset,
|
| uint64_t num_bytes,
|
|
|