| 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..b2858e97bda4724478cbdc337d6296f1b36fd7dc 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 "device/generic_sensor/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(device::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,
|
| + sizeof(device::SharedMemorySeqLockBuffer<Data>))) {
|
| + buffer_ = static_cast<device::SharedMemorySeqLockBuffer<Data>*>(memory);
|
| temp_buffer_.reset(new Data);
|
| return true;
|
| }
|
| @@ -63,7 +67,7 @@ class SharedMemorySeqLockReader
|
| }
|
|
|
| private:
|
| - SharedMemorySeqLockBuffer<Data>* buffer_;
|
| + device::SharedMemorySeqLockBuffer<Data>* buffer_;
|
| std::unique_ptr<Data> temp_buffer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SharedMemorySeqLockReader);
|
|
|