Remove ArrayBufferDeallocationObserver

Source/wtf/ArrayBufferContents.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 #include "config.h"
 #include "wtf/ArrayBufferContents.h"
 
 #include "wtf/Assertions.h"
 #include "wtf/PartitionAlloc.h"
 #include "wtf/Partitions.h"
 #include <string.h>
 
 namespace WTF {
 
+AdjustAmountOfExternalAllocatedMemoryFunction ArrayBufferContents::s_adjustAmountOfExternalAllocatedMemoryFunction;
+
 ArrayBufferContents::ArrayBufferContents()
     : m_data(0)
-    , m_sizeInBytes(0)
-    , m_deallocationObserver(0) { }
+    , m_sizeInBytes(0) { }
 
 ArrayBufferContents::ArrayBufferContents(unsigned numElements, unsigned elementByteSize, ArrayBufferContents::InitializationPolicy policy)
     : m_data(0)
     , m_sizeInBytes(0)
-    , m_deallocationObserver(0)
 {
     // Do not allow 32-bit overflow of the total size.
     if (numElements) {
         unsigned totalSize = numElements * elementByteSize;
         if (totalSize / numElements != elementByteSize) {
             m_data = 0;
             return;
         }
     }
     allocateMemory(numElements * elementByteSize, policy, m_data);
     m_sizeInBytes = numElements * elementByteSize;
 }
 
-ArrayBufferContents::ArrayBufferContents(
-    void* data, unsigned sizeInBytes, ArrayBufferDeallocationObserver* observer)
+ArrayBufferContents::ArrayBufferContents(void* data, unsigned sizeInBytes)
     : m_data(data)
     , m_sizeInBytes(sizeInBytes)
-    , m_deallocationObserver(observer)
 {
     if (!m_data) {
         ASSERT(!m_sizeInBytes);
         m_sizeInBytes = 0;
         // Allow null data if size is 0 bytes, make sure m_data is valid pointer.
         // (partitionAllocGeneric guarantees valid pointer for size 0)
         allocateMemory(0, ZeroInitialize, m_data);
     }
 }
 
 ArrayBufferContents::~ArrayBufferContents()
 {
     freeMemory(m_data, m_sizeInBytes);
     clear();
 }
 
 void ArrayBufferContents::clear()
 {
-    if (m_data && m_deallocationObserver)
-        m_deallocationObserver->arrayBufferDeallocated(m_sizeInBytes);
     m_data = 0;
     m_sizeInBytes = 0;
-    m_deallocationObserver = 0;
 }
 
 void ArrayBufferContents::transfer(ArrayBufferContents& other)
 {
     ASSERT(!other.m_data);
     other.m_data = m_data;
     other.m_sizeInBytes = m_sizeInBytes;
     clear();
 }
 
 void ArrayBufferContents::copyTo(ArrayBufferContents& other)
 {
     ASSERT(!other.m_sizeInBytes);
     other.freeMemory(other.m_data, other.m_sizeInBytes);
     allocateMemory(m_sizeInBytes, DontInitialize, other.m_data);
     if (!other.m_data)
         return;
     memcpy(other.m_data, m_data, m_sizeInBytes);
     other.m_sizeInBytes = m_sizeInBytes;
 }
 
 void ArrayBufferContents::allocateMemory(size_t size, InitializationPolicy policy, void*& data)
 {
+    if (s_adjustAmountOfExternalAllocatedMemoryFunction)
+        s_adjustAmountOfExternalAllocatedMemoryFunction(static_cast<int>(size));
     data = partitionAllocGenericFlags(WTF::Partitions::getBufferPartition(), PartitionAllocReturnNull, size);
     if (policy == ZeroInitialize && data)
         memset(data, '\0', size);
 }
 
-void ArrayBufferContents::freeMemory(void* data, size_t)
+void ArrayBufferContents::freeMemory(void* data, size_t size)
 {
     partitionFreeGeneric(WTF::Partitions::getBufferPartition(), data);
+    if (s_adjustAmountOfExternalAllocatedMemoryFunction)
+        s_adjustAmountOfExternalAllocatedMemoryFunction(-static_cast<int>(size));
 }
 
 } // namespace WTF