| Index: components/discardable_memory/service/discardable_shared_memory_manager.h
|
| diff --git a/components/discardable_memory/service/discardable_shared_memory_manager.h b/components/discardable_memory/service/discardable_shared_memory_manager.h
|
| index 7ccadf18a44b3b1c68a540e9f4647b0d3778bd44..bf3e11327190deaed9f64220a6f019d68e862aeb 100644
|
| --- a/components/discardable_memory/service/discardable_shared_memory_manager.h
|
| +++ b/components/discardable_memory/service/discardable_shared_memory_manager.h
|
| @@ -27,7 +27,6 @@
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "base/trace_event/memory_dump_provider.h"
|
| #include "components/discardable_memory/common/discardable_memory_export.h"
|
| -#include "components/discardable_memory/common/discardable_shared_memory_id.h"
|
|
|
| namespace discardable_memory {
|
|
|
| @@ -55,20 +54,17 @@ class DISCARDABLE_MEMORY_EXPORT DiscardableSharedMemoryManager
|
| bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) override;
|
|
|
| - // TODO(penghuang): Get ride of the |process_handle| when we switch to mojo.
|
| // This allocates a discardable memory segment for |process_handle|.
|
| // A valid shared memory handle is returned on success.
|
| void AllocateLockedDiscardableSharedMemoryForClient(
|
| - base::ProcessHandle process_handle,
|
| int client_id,
|
| size_t size,
|
| - DiscardableSharedMemoryId id,
|
| + int32_t id,
|
| base::SharedMemoryHandle* shared_memory_handle);
|
|
|
| // Call this to notify the manager that client process associated with
|
| // |client_id| has deleted discardable memory segment with |id|.
|
| - void ClientDeletedDiscardableSharedMemory(DiscardableSharedMemoryId id,
|
| - int client_id);
|
| + void ClientDeletedDiscardableSharedMemory(int32_t id, int client_id);
|
|
|
| // Call this to notify the manager that client associated with |client_id|
|
| // has been removed. The manager will use this to release memory segments
|
| @@ -111,15 +107,12 @@ class DISCARDABLE_MEMORY_EXPORT DiscardableSharedMemoryManager
|
| // base::MemoryCoordinatorClient implementation:
|
| void OnMemoryStateChange(base::MemoryState state) override;
|
|
|
| - // TODO(penghuang): Get ride of the |process_handle| when we switch to mojo.
|
| void AllocateLockedDiscardableSharedMemory(
|
| - base::ProcessHandle process_handle,
|
| int client_id,
|
| size_t size,
|
| - DiscardableSharedMemoryId id,
|
| + int32_t id,
|
| base::SharedMemoryHandle* shared_memory_handle);
|
| - void DeletedDiscardableSharedMemory(DiscardableSharedMemoryId id,
|
| - int client_id);
|
| + void DeletedDiscardableSharedMemory(int32_t id, int client_id);
|
| void OnMemoryPressure(
|
| base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
|
| void ReduceMemoryUsageUntilWithinMemoryLimit();
|
| @@ -132,8 +125,7 @@ class DISCARDABLE_MEMORY_EXPORT DiscardableSharedMemoryManager
|
| virtual void ScheduleEnforceMemoryPolicy();
|
|
|
| base::Lock lock_;
|
| - typedef base::hash_map<DiscardableSharedMemoryId,
|
| - scoped_refptr<MemorySegment>>
|
| + typedef base::hash_map<int32_t, scoped_refptr<MemorySegment>>
|
| MemorySegmentMap;
|
| typedef base::hash_map<int, MemorySegmentMap> ClientMap;
|
| ClientMap clients_;
|
|
|