summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-08 14:30:41 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-12 13:49:54 +0200
commitab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch)
tree498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h
parent4ce69f7403811819800e7c5ae1318b2647e778d1 (diff)
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h')
-rw-r--r--chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h b/chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h
index 3ecda8daa9d..feb3b10aa36 100644
--- a/chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h
+++ b/chromium/third_party/WebKit/Source/wtf/ArrayBuffer.h
@@ -60,7 +60,7 @@ public:
void addView(ArrayBufferView*);
void removeView(ArrayBufferView*);
- bool transfer(ArrayBufferContents&, Vector<RefPtr<ArrayBufferView> >& neuteredViews);
+ bool transfer(ArrayBufferContents&);
bool isNeutered() { return m_isNeutered; }
void setDeallocationObserver(ArrayBufferDeallocationObserver* observer) { m_contents.setDeallocationObserver(observer); }
@@ -104,7 +104,7 @@ PassRefPtr<ArrayBuffer> ArrayBuffer::create(const void* source, unsigned byteLen
{
ArrayBufferContents contents(byteLength, 1, ArrayBufferContents::ZeroInitialize);
if (!contents.data())
- return 0;
+ return nullptr;
RefPtr<ArrayBuffer> buffer = adoptRef(new ArrayBuffer(contents));
memcpy(buffer->data(), source, byteLength);
return buffer.release();
@@ -124,7 +124,7 @@ PassRefPtr<ArrayBuffer> ArrayBuffer::create(unsigned numElements, unsigned eleme
{
ArrayBufferContents contents(numElements, elementByteSize, policy);
if (!contents.data())
- return 0;
+ return nullptr;
return adoptRef(new ArrayBuffer(contents));
}