Revert "Revert 239763 "Add DiscardableMemoryAllocator to minimize use…

… of..."" The previous attempt failed due to ASAN complaining during the DiscardableMemory.TooLargeAllocationFails test (which is quite expected). TBR=willchan BUG=299828 Review URL: https://codereview.chromium.org/101953003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239816 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Dec 10, 2013 · 60b25c6 · 60b25c6
1 parent 9976b24
commit 60b25c6
Show file tree

Hide file tree

Showing 9 changed files with 926 additions and 60 deletions.
diff --git a/base/base.gyp b/base/base.gyp
@@ -552,6 +552,7 @@
         'mac/scoped_sending_event_unittest.mm',
         'md5_unittest.cc',
         'memory/aligned_memory_unittest.cc',
+        'memory/discardable_memory_allocator_android_unittest.cc',
         'memory/discardable_memory_unittest.cc',
         'memory/discardable_memory_provider_unittest.cc',
         'memory/linked_ptr_unittest.cc',

diff --git a/base/base.gypi b/base/base.gypi
@@ -292,6 +292,8 @@
           'memory/aligned_memory.cc',
           'memory/aligned_memory.h',
           'memory/discardable_memory.h',
+          'memory/discardable_memory_allocator_android.h',
+          'memory/discardable_memory_allocator_android.cc',
           'memory/discardable_memory_android.cc',
           'memory/discardable_memory_emulated.cc',
           'memory/discardable_memory_mac.cc',

diff --git a/base/memory/discardable_memory.h b/base/memory/discardable_memory.h
@@ -47,6 +47,8 @@ enum LockDiscardableMemoryStatus {
 //   - Mac: http://trac.webkit.org/browser/trunk/Source/WebCore/platform/mac/PurgeableBufferMac.cpp
 //          the comment starting with "vm_object_purgable_control" at
 //            http://www.opensource.apple.com/source/xnu/xnu-792.13.8/osfmk/vm/vm_object.c
+//
+// Thread-safety: DiscardableMemory instances are not thread-safe.
 class BASE_EXPORT DiscardableMemory {
  public:
   virtual ~DiscardableMemory() {}