Chromium Code Reviews| Index: content/renderer/shared_memory_seqlock_reader.h |
| diff --git a/content/renderer/shared_memory_seqlock_reader.h b/content/renderer/shared_memory_seqlock_reader.h |
| index a7a7a222b61bf6993a6bc836c8e9f217d0f98f46..0285c0f0b86f76adfe2135e530c5ef65341e0d39 100644 |
| --- a/content/renderer/shared_memory_seqlock_reader.h |
| +++ b/content/renderer/shared_memory_seqlock_reader.h |
| @@ -12,7 +12,7 @@ |
| #include "base/logging.h" |
| #include "base/macros.h" |
| #include "base/memory/shared_memory.h" |
| -#include "content/common/shared_memory_seqlock_buffer.h" |
| +#include "base/synchronization/shared_memory_seqlock_buffer.h" |
| namespace content { |
| namespace internal { |
| @@ -26,8 +26,11 @@ class SharedMemorySeqLockReaderBase { |
| base::SharedMemoryHandle shared_memory_handle, |
| size_t buffer_size); |
| - bool FetchFromBuffer(content::OneWriterSeqLock* seqlock, void* final, |
| - void* temp, void* from, size_t size); |
| + bool FetchFromBuffer(base::OneWriterSeqLock* seqlock, |
| + void* final, |
| + void* temp, |
| + void* from, |
| + size_t size); |
| static const int kMaximumContentionCount = 10; |
| base::SharedMemoryHandle renderer_shared_memory_handle_; |
| @@ -54,8 +57,9 @@ class SharedMemorySeqLockReader |
| bool Initialize(base::SharedMemoryHandle shared_memory_handle) { |
| if (void* memory = InitializeSharedMemory( |
| - shared_memory_handle, sizeof(SharedMemorySeqLockBuffer<Data>))) { |
| - buffer_ = static_cast<SharedMemorySeqLockBuffer<Data>*>(memory); |
| + shared_memory_handle, |
|
timvolodine
2016/09/23 17:34:28
is this the correct indentation? I thought it shou
|
| + sizeof(base::SharedMemorySeqLockBuffer<Data>))) { |
| + buffer_ = static_cast<base::SharedMemorySeqLockBuffer<Data>*>(memory); |
| temp_buffer_.reset(new Data); |
| return true; |
| } |
| @@ -63,7 +67,7 @@ class SharedMemorySeqLockReader |
| } |
| private: |
| - SharedMemorySeqLockBuffer<Data>* buffer_; |
| + base::SharedMemorySeqLockBuffer<Data>* buffer_; |
| std::unique_ptr<Data> temp_buffer_; |
| DISALLOW_COPY_AND_ASSIGN(SharedMemorySeqLockReader); |