Revert "Add size_t length argument to v8::ArrayBuffer::Allocator::Free."

This reverts r16031 for breaking shared build.

TBR=mstarzinger@chromium.org

Review URL: https://codereview.chromium.org/21818003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16032 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
dslomov@chromium.org 2013-08-02 12:56:53 +00:00
parent 1688f3c167
commit f8b80ca66d
5 changed files with 7 additions and 28 deletions

View File

@ -2425,20 +2425,10 @@ class V8EXPORT ArrayBuffer : public Object {
}
/**
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
* Free the memory pointed to |data|. That memory is guaranteed to be
* previously allocated by |Allocate|.
*/
virtual void Free(void* data, size_t length) {
// Override with call to |Free(void*)| for compatibility
// with legacy version.
Free(data);
}
/**
* Deprecated. Never called directly by V8.
* For compatibility with legacy version of this interface.
*/
virtual void Free(void* data);
virtual void Free(void* data) = 0;
};
/**

View File

@ -3071,12 +3071,6 @@ void v8::ArrayBuffer::CheckCast(Value* that) {
}
void v8::ArrayBuffer::Allocator::Free(void* data) {
API_Fatal("v8::ArrayBuffer::Allocator::Free",
"Override Allocator::Free(void*, size_t)");
}
void v8::ArrayBufferView::CheckCast(Value* that) {
i::Handle<i::Object> obj = Utils::OpenHandle(that);
ApiCheck(obj->IsJSArrayBufferView(),

View File

@ -1635,9 +1635,7 @@ class ShellArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
virtual void* AllocateUninitialized(size_t length) {
return malloc(length);
}
virtual void Free(void* data, size_t) { free(data); }
// TODO(dslomov): Remove when v8:2823 is fixed.
virtual void Free(void* data) { UNREACHABLE(); }
virtual void Free(void* data) { free(data); }
};

View File

@ -689,9 +689,7 @@ void Runtime::FreeArrayBuffer(Isolate* isolate,
isolate->heap()->AdjustAmountOfExternalAllocatedMemory(
-static_cast<intptr_t>(allocated_length));
CHECK(V8::ArrayBufferAllocator() != NULL);
V8::ArrayBufferAllocator()->Free(
phantom_array_buffer->backing_store(),
allocated_length);
V8::ArrayBufferAllocator()->Free(phantom_array_buffer->backing_store());
}

View File

@ -99,10 +99,9 @@ v8::Isolate* CcTest::default_isolate_;
class CcTestArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
public:
virtual void* Allocate(size_t length) { return malloc(length); }
virtual void Free(void* data, size_t length) { free(data); }
// TODO(dslomov): Remove when v8:2823 is fixed.
virtual void Free(void* data) { UNREACHABLE(); }
virtual void Free(void* data) { free(data); }
};