Remove accounting from ArrayBuffer::Allocator

third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp

Index: third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp
diff --git a/third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp b/third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp
index 7c3997240d2f984ff7644ea20fa7ee65339ebf16..466d5ed12744f7850d6da0a274a0695cc69ab427 100644
--- a/third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp
+++ b/third_party/WebKit/Source/wtf/typed_arrays/ArrayBufferContents.cpp
@@ -99,8 +99,6 @@ void ArrayBufferContents::copyTo(ArrayBufferContents& other)
 
 void ArrayBufferContents::allocateMemoryWithFlags(size_t size, InitializationPolicy policy, int flags, void*& data)
 {
-    if (s_adjustAmountOfExternalAllocatedMemoryFunction)
-        s_adjustAmountOfExternalAllocatedMemoryFunction(static_cast<int>(size));
     data = partitionAllocGenericFlags(WTF::Partitions::bufferPartition(), flags, size, WTF_HEAP_PROFILER_TYPE_NAME(ArrayBufferContents));
     if (policy == ZeroInitialize && data)
         memset(data, '\0', size);
@@ -119,8 +117,6 @@ void ArrayBufferContents::allocateMemoryOrNull(size_t size, InitializationPolicy
 void ArrayBufferContents::freeMemory(void* data, size_t size)
 {
     Partitions::bufferFree(data);
-    if (s_adjustAmountOfExternalAllocatedMemoryFunction)
-        s_adjustAmountOfExternalAllocatedMemoryFunction(-static_cast<int>(size));
 }
 
 ArrayBufferContents::DataHolder::DataHolder()
@@ -131,6 +127,8 @@ ArrayBufferContents::DataHolder::DataHolder()
 ArrayBufferContents::DataHolder::~DataHolder()
 {
     ArrayBufferContents::freeMemory(m_data, m_sizeInBytes);
+    if (s_adjustAmountOfExternalAllocatedMemoryFunction)
+        s_adjustAmountOfExternalAllocatedMemoryFunction(-static_cast<int>(m_sizeInBytes));
 
     m_data = nullptr;
     m_sizeInBytes = 0;
@@ -141,6 +139,8 @@ void ArrayBufferContents::DataHolder::allocateNew(unsigned sizeInBytes, SharingT
 {
     ASSERT(!m_data);
     void* data = nullptr;
+    if (s_adjustAmountOfExternalAllocatedMemoryFunction)

[sof, 2016/05/17 21:05:04]

What if allocateMemory() isn't able to allocate |sizeInBytes|, don't you either
need to re-balance the books or delay this call until after the allocation (has
succeeded)?

[Michael Lippautz, 2016/05/18 08:05:09]

Thanks, you are right. I was not aware that a failing allocation does not
trigger an OOM but rather represents a valid state. 

See: https://codereview.chromium.org/1993623002/

+        s_adjustAmountOfExternalAllocatedMemoryFunction(static_cast<int>(sizeInBytes));
     allocateMemory(sizeInBytes, policy, data);
     m_data = data;
     m_sizeInBytes = data ? sizeInBytes : 0;