Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(863)

Unified Diff: content/child/child_discardable_shared_memory_manager.h

Issue 1012163002: content: Cancel all DeletedDiscardableSharedMemory callbacks in dtor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/child_discardable_shared_memory_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_discardable_shared_memory_manager.h
diff --git a/content/child/child_discardable_shared_memory_manager.h b/content/child/child_discardable_shared_memory_manager.h
index cc534e4301fb226989bf6ffa48b4570096ee88cb..518f72b600854dbe129867c5c434550881a3033d 100644
--- a/content/child/child_discardable_shared_memory_manager.h
+++ b/content/child/child_discardable_shared_memory_manager.h
@@ -7,6 +7,7 @@
#include "base/memory/discardable_memory_shmem_allocator.h"
#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
#include "content/child/thread_safe_sender.h"
#include "content/common/content_export.h"
@@ -38,12 +39,14 @@ class CONTENT_EXPORT ChildDiscardableSharedMemoryManager
scoped_ptr<base::DiscardableSharedMemory>
AllocateLockedDiscardableSharedMemory(size_t size,
DiscardableSharedMemoryId id);
+ void DeletedDiscardableSharedMemory(DiscardableSharedMemoryId id);
void MemoryUsageChanged(size_t new_bytes_allocated,
size_t new_bytes_free) const;
mutable base::Lock lock_;
DiscardableSharedMemoryHeap heap_;
scoped_refptr<ThreadSafeSender> sender_;
+ base::WeakPtrFactory<ChildDiscardableSharedMemoryManager> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(ChildDiscardableSharedMemoryManager);
};
« no previous file with comments | « no previous file | content/child/child_discardable_shared_memory_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698