| Index: components/discardable_memory/client/client_discardable_shared_memory_manager.h
|
| diff --git a/content/child/child_discardable_shared_memory_manager.h b/components/discardable_memory/client/client_discardable_shared_memory_manager.h
|
| similarity index 62%
|
| rename from content/child/child_discardable_shared_memory_manager.h
|
| rename to components/discardable_memory/client/client_discardable_shared_memory_manager.h
|
| index 9f83e1c19c887104db28e793d1263da9f7431e42..cb34bc6842f53a24ffa376c66ee26aa3d87b19bd 100644
|
| --- a/content/child/child_discardable_shared_memory_manager.h
|
| +++ b/components/discardable_memory/client/client_discardable_shared_memory_manager.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
| -#define CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
| +#ifndef COMPONENTS_DISCARDABLE_MEMORY_CLIENT_CLIENT_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
| +#define COMPONENTS_DISCARDABLE_MEMORY_CLIENT_CLIENT_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
|
|
| #include <stddef.h>
|
|
|
| @@ -12,21 +12,33 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/trace_event/memory_dump_provider.h"
|
| -#include "content/child/thread_safe_sender.h"
|
| -#include "content/common/content_export.h"
|
| -#include "content/common/discardable_shared_memory_heap.h"
|
| -#include "content/common/host_discardable_shared_memory_manager.h"
|
| +#include "components/discardable_memory/common/discardable_memory_export.h"
|
| +#include "components/discardable_memory/common/discardable_shared_memory_heap.h"
|
| +#include "components/discardable_memory/common/discardable_shared_memory_manager.h"
|
|
|
| -namespace content {
|
| +namespace discardable_memory {
|
|
|
| // Implementation of DiscardableMemoryAllocator that allocates
|
| // discardable memory segments through the browser process.
|
| -class CONTENT_EXPORT ChildDiscardableSharedMemoryManager
|
| +class DISCARDABLE_MEMORY_EXPORT ClientDiscardableSharedMemoryManager
|
| : public base::DiscardableMemoryAllocator,
|
| public base::trace_event::MemoryDumpProvider {
|
| public:
|
| - explicit ChildDiscardableSharedMemoryManager(ThreadSafeSender* sender);
|
| - ~ChildDiscardableSharedMemoryManager() override;
|
| + class Delegate {
|
| + public:
|
| + virtual void AllocateLockedDiscardableSharedMemory(
|
| + size_t size,
|
| + DiscardableSharedMemoryId id,
|
| + base::SharedMemoryHandle* handle) = 0;
|
| + virtual void DeletedDiscardableSharedMemory(
|
| + DiscardableSharedMemoryId id) = 0;
|
| +
|
| + protected:
|
| + virtual ~Delegate() {}
|
| + };
|
| +
|
| + explicit ClientDiscardableSharedMemoryManager(Delegate* delegate);
|
| + ~ClientDiscardableSharedMemoryManager() override;
|
|
|
| // Overridden from base::DiscardableMemoryAllocator:
|
| std::unique_ptr<base::DiscardableMemory> AllocateLockedDiscardableMemory(
|
| @@ -64,11 +76,11 @@ class CONTENT_EXPORT ChildDiscardableSharedMemoryManager
|
|
|
| mutable base::Lock lock_;
|
| DiscardableSharedMemoryHeap heap_;
|
| - scoped_refptr<ThreadSafeSender> sender_;
|
| + Delegate* const delegate_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ChildDiscardableSharedMemoryManager);
|
| + DISALLOW_COPY_AND_ASSIGN(ClientDiscardableSharedMemoryManager);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace discardable_memory
|
|
|
| -#endif // CONTENT_CHILD_CHILD_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
| +#endif // COMPONENTS_DISCARDABLE_MEMORY_CLIENT_CLIENT_DISCARDABLE_SHARED_MEMORY_MANAGER_H_
|
|
|